diff --git a/Src/.gradle/7.5/checksums/checksums.lock b/Src/.gradle/7.5/checksums/checksums.lock index 1acaf8b..8128dd8 100644 Binary files a/Src/.gradle/7.5/checksums/checksums.lock and b/Src/.gradle/7.5/checksums/checksums.lock differ diff --git a/Src/.gradle/7.5/checksums/md5-checksums.bin b/Src/.gradle/7.5/checksums/md5-checksums.bin index 2d15507..536a5a8 100644 Binary files a/Src/.gradle/7.5/checksums/md5-checksums.bin and b/Src/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/Src/.gradle/7.5/checksums/sha1-checksums.bin b/Src/.gradle/7.5/checksums/sha1-checksums.bin index bf36d73..0297e21 100644 Binary files a/Src/.gradle/7.5/checksums/sha1-checksums.bin and b/Src/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/Src/.gradle/7.5/executionHistory/executionHistory.bin b/Src/.gradle/7.5/executionHistory/executionHistory.bin index b2fdc8f..bdc759b 100644 Binary files a/Src/.gradle/7.5/executionHistory/executionHistory.bin and b/Src/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/Src/.gradle/7.5/executionHistory/executionHistory.lock b/Src/.gradle/7.5/executionHistory/executionHistory.lock index af4c9ae..0c64c06 100644 Binary files a/Src/.gradle/7.5/executionHistory/executionHistory.lock and b/Src/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/Src/.gradle/7.5/fileHashes/fileHashes.bin b/Src/.gradle/7.5/fileHashes/fileHashes.bin index 51fe87b..4938654 100644 Binary files a/Src/.gradle/7.5/fileHashes/fileHashes.bin and b/Src/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/Src/.gradle/7.5/fileHashes/fileHashes.lock b/Src/.gradle/7.5/fileHashes/fileHashes.lock index 8cc0fe5..2f2e2a8 100644 Binary files a/Src/.gradle/7.5/fileHashes/fileHashes.lock and b/Src/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/Src/.gradle/7.5/fileHashes/resourceHashesCache.bin b/Src/.gradle/7.5/fileHashes/resourceHashesCache.bin index 3deeae0..cf276d6 100644 Binary files a/Src/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/Src/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 3058dc4..6955966 100644 Binary files a/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Src/.gradle/buildOutputCleanup/outputFiles.bin b/Src/.gradle/buildOutputCleanup/outputFiles.bin index 6351dd7..cd973d8 100644 Binary files a/Src/.gradle/buildOutputCleanup/outputFiles.bin and b/Src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/Src/.gradle/file-system.probe b/Src/.gradle/file-system.probe index 18e654e..b82059e 100644 Binary files a/Src/.gradle/file-system.probe and b/Src/.gradle/file-system.probe differ diff --git a/Src/.vscode/settings.json b/Src/.vscode/settings.json new file mode 100644 index 0000000..120329c --- /dev/null +++ b/Src/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "modelbox.modelboxPath": "C:\\Users\\zjb\\.modelbox" +} \ No newline at end of file diff --git a/Src/app/build.gradle b/Src/app/build.gradle index d5d03f6..f899b34 100644 --- a/Src/app/build.gradle +++ b/Src/app/build.gradle @@ -13,6 +13,9 @@ android { applicationId "net.micode.notes" minSdk 21 targetSdkVersion defaultTargetSdkVersion + ndk { + abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" // 确保包含目标架构 + } } buildTypes { @@ -21,8 +24,26 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - + repositories { + google() + mavenCentral() // Maven Central 仓库 + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 } -} + dependencies { + implementation 'com.alphacephei:vosk-android:0.3.38' + implementation 'net.java.dev.jna:jna:5.5.0' + implementation 'net.java.dev.jna:jna-platform:5.5.0' + } + sourceSets { + main { + jniLibs.srcDirs = ['src/main/jniLibs'] + } + + } + packagingOptions { + exclude 'META-INF/AL2.0' + exclude 'META-INF/LGPL2.1' + } +} \ No newline at end of file diff --git a/Src/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java b/Src/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java new file mode 100644 index 0000000..b067bc1 --- /dev/null +++ b/Src/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java @@ -0,0 +1,10 @@ +/** + * Automatically generated file. DO NOT MODIFY + */ +package net.micode.notes.test; + +public final class BuildConfig { + public static final boolean DEBUG = Boolean.parseBoolean("true"); + public static final String APPLICATION_ID = "net.micode.notes.test"; + public static final String BUILD_TYPE = "debug"; +} diff --git a/Src/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json b/Src/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/Src/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/Src/app/build/intermediates/apk/debug/app-debug.apk b/Src/app/build/intermediates/apk/debug/app-debug.apk index 8fbb75a..569ad00 100644 Binary files a/Src/app/build/intermediates/apk/debug/app-debug.apk and b/Src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/Src/app/build/intermediates/apk_ide_redirect_file/debugAndroidTest/redirect.txt b/Src/app/build/intermediates/apk_ide_redirect_file/debugAndroidTest/redirect.txt new file mode 100644 index 0000000..b7d5868 --- /dev/null +++ b/Src/app/build/intermediates/apk_ide_redirect_file/debugAndroidTest/redirect.txt @@ -0,0 +1,2 @@ +#- File Locator - +listingFile=../../../outputs/apk/androidTest/debug/output-metadata.json diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/README b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/README new file mode 100644 index 0000000..0b5d9e5 --- /dev/null +++ b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/README @@ -0,0 +1,6 @@ +Chinese Vosk model for mobile + +CER results + +23.54% speechio_02 +38.29% speechio_06 diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/am/final.mdl b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/am/final.mdl new file mode 100644 index 0000000..f7cf1de Binary files /dev/null and b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/am/final.mdl differ diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/conf/mfcc.conf b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/conf/mfcc.conf new file mode 100644 index 0000000..12fdad4 --- /dev/null +++ b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/conf/mfcc.conf @@ -0,0 +1,8 @@ +--use-energy=false +--sample-frequency=16000 +--num-mel-bins=40 +--num-ceps=40 +--low-freq=40 +--high-freq=-200 +--allow-upsample=true +--allow-downsample=true diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/conf/model.conf b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/conf/model.conf new file mode 100644 index 0000000..9ae12a7 --- /dev/null +++ b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/conf/model.conf @@ -0,0 +1,10 @@ +--min-active=200 +--max-active=5000 +--beam=12.0 +--lattice-beam=4.0 +--acoustic-scale=1.0 +--frame-subsampling-factor=3 +--endpoint.silence-phones=1:2:3:4:5:6:7:8:9:10 +--endpoint.rule2.min-trailing-silence=0.5 +--endpoint.rule3.min-trailing-silence=1.0 +--endpoint.rule4.min-trailing-silence=2.0 diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/Gr.fst b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/Gr.fst new file mode 100644 index 0000000..ee4580d Binary files /dev/null and b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/Gr.fst differ diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/HCLr.fst b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/HCLr.fst new file mode 100644 index 0000000..2ad6e8f Binary files /dev/null and b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/HCLr.fst differ diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/disambig_tid.int b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/disambig_tid.int new file mode 100644 index 0000000..c1a114f --- /dev/null +++ b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/disambig_tid.int @@ -0,0 +1,39 @@ +11845 +11846 +11847 +11848 +11849 +11850 +11851 +11852 +11853 +11854 +11855 +11856 +11857 +11858 +11859 +11860 +11861 +11862 +11863 +11864 +11865 +11866 +11867 +11868 +11869 +11870 +11871 +11872 +11873 +11874 +11875 +11876 +11877 +11878 +11879 +11880 +11881 +11882 +11883 diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/phones/word_boundary.int b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/phones/word_boundary.int new file mode 100644 index 0000000..9f3713e --- /dev/null +++ b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/graph/phones/word_boundary.int @@ -0,0 +1,646 @@ +1 nonword +2 begin +3 end +4 internal +5 singleton +6 nonword +7 begin +8 end +9 internal +10 singleton +11 begin +12 end +13 internal +14 singleton +15 begin +16 end +17 internal +18 singleton +19 begin +20 end +21 internal +22 singleton +23 begin +24 end +25 internal +26 singleton +27 begin +28 end +29 internal +30 singleton +31 begin +32 end +33 internal +34 singleton +35 begin +36 end +37 internal +38 singleton +39 begin +40 end +41 internal +42 singleton +43 begin +44 end +45 internal +46 singleton +47 begin +48 end +49 internal +50 singleton +51 begin +52 end +53 internal +54 singleton +55 begin +56 end +57 internal +58 singleton +59 begin +60 end +61 internal +62 singleton +63 begin +64 end +65 internal +66 singleton +67 begin +68 end +69 internal +70 singleton +71 begin +72 end +73 internal +74 singleton +75 begin +76 end +77 internal +78 singleton +79 begin +80 end +81 internal +82 singleton +83 begin +84 end +85 internal +86 singleton +87 begin +88 end +89 internal +90 singleton +91 begin +92 end +93 internal +94 singleton +95 begin +96 end +97 internal +98 singleton +99 begin +100 end +101 internal +102 singleton +103 begin +104 end +105 internal +106 singleton +107 begin +108 end +109 internal +110 singleton +111 begin +112 end +113 internal +114 singleton +115 begin +116 end +117 internal +118 singleton +119 begin +120 end +121 internal +122 singleton +123 begin +124 end +125 internal +126 singleton +127 begin +128 end +129 internal +130 singleton +131 begin +132 end +133 internal +134 singleton +135 begin +136 end +137 internal +138 singleton +139 begin +140 end +141 internal +142 singleton +143 begin +144 end +145 internal +146 singleton +147 begin +148 end +149 internal +150 singleton +151 begin +152 end +153 internal +154 singleton +155 begin +156 end +157 internal +158 singleton +159 begin +160 end +161 internal +162 singleton +163 begin +164 end +165 internal +166 singleton +167 begin +168 end +169 internal +170 singleton +171 begin +172 end +173 internal +174 singleton +175 begin +176 end +177 internal +178 singleton +179 begin +180 end +181 internal +182 singleton +183 begin +184 end +185 internal +186 singleton +187 begin +188 end +189 internal +190 singleton +191 begin +192 end +193 internal +194 singleton +195 begin +196 end +197 internal +198 singleton +199 begin +200 end +201 internal +202 singleton +203 begin +204 end +205 internal +206 singleton +207 begin +208 end +209 internal +210 singleton +211 begin +212 end +213 internal +214 singleton +215 begin +216 end +217 internal +218 singleton +219 begin +220 end +221 internal +222 singleton +223 begin +224 end +225 internal +226 singleton +227 begin +228 end +229 internal +230 singleton +231 begin +232 end +233 internal +234 singleton +235 begin +236 end +237 internal +238 singleton +239 begin +240 end +241 internal +242 singleton +243 begin +244 end +245 internal +246 singleton +247 begin +248 end +249 internal +250 singleton +251 begin +252 end +253 internal +254 singleton +255 begin +256 end +257 internal +258 singleton +259 begin +260 end +261 internal +262 singleton +263 begin +264 end +265 internal +266 singleton +267 begin +268 end +269 internal +270 singleton +271 begin +272 end +273 internal +274 singleton +275 begin +276 end +277 internal +278 singleton +279 begin +280 end +281 internal +282 singleton +283 begin +284 end +285 internal +286 singleton +287 begin +288 end +289 internal +290 singleton +291 begin +292 end +293 internal +294 singleton +295 begin +296 end +297 internal +298 singleton +299 begin +300 end +301 internal +302 singleton +303 begin +304 end +305 internal +306 singleton +307 begin +308 end +309 internal +310 singleton +311 begin +312 end +313 internal +314 singleton +315 begin +316 end +317 internal +318 singleton +319 begin +320 end +321 internal +322 singleton +323 begin +324 end +325 internal +326 singleton +327 begin +328 end +329 internal +330 singleton +331 begin +332 end +333 internal +334 singleton +335 begin +336 end +337 internal +338 singleton +339 begin +340 end +341 internal +342 singleton +343 begin +344 end +345 internal +346 singleton +347 begin +348 end +349 internal +350 singleton +351 begin +352 end +353 internal +354 singleton +355 begin +356 end +357 internal +358 singleton +359 begin +360 end +361 internal +362 singleton +363 begin +364 end +365 internal +366 singleton +367 begin +368 end +369 internal +370 singleton +371 begin +372 end +373 internal +374 singleton +375 begin +376 end +377 internal +378 singleton +379 begin +380 end +381 internal +382 singleton +383 begin +384 end +385 internal +386 singleton +387 begin +388 end +389 internal +390 singleton +391 begin +392 end +393 internal +394 singleton +395 begin +396 end +397 internal +398 singleton +399 begin +400 end +401 internal +402 singleton +403 begin +404 end +405 internal +406 singleton +407 begin +408 end +409 internal +410 singleton +411 begin +412 end +413 internal +414 singleton +415 begin +416 end +417 internal +418 singleton +419 begin +420 end +421 internal +422 singleton +423 begin +424 end +425 internal +426 singleton +427 begin +428 end +429 internal +430 singleton +431 begin +432 end +433 internal +434 singleton +435 begin +436 end +437 internal +438 singleton +439 begin +440 end +441 internal +442 singleton +443 begin +444 end +445 internal +446 singleton +447 begin +448 end +449 internal +450 singleton +451 begin +452 end +453 internal +454 singleton +455 begin +456 end +457 internal +458 singleton +459 begin +460 end +461 internal +462 singleton +463 begin +464 end +465 internal +466 singleton +467 begin +468 end +469 internal +470 singleton +471 begin +472 end +473 internal +474 singleton +475 begin +476 end +477 internal +478 singleton +479 begin +480 end +481 internal +482 singleton +483 begin +484 end +485 internal +486 singleton +487 begin +488 end +489 internal +490 singleton +491 begin +492 end +493 internal +494 singleton +495 begin +496 end +497 internal +498 singleton +499 begin +500 end +501 internal +502 singleton +503 begin +504 end +505 internal +506 singleton +507 begin +508 end +509 internal +510 singleton +511 begin +512 end +513 internal +514 singleton +515 begin +516 end +517 internal +518 singleton +519 begin +520 end +521 internal +522 singleton +523 begin +524 end +525 internal +526 singleton +527 begin +528 end +529 internal +530 singleton +531 begin +532 end +533 internal +534 singleton +535 begin +536 end +537 internal +538 singleton +539 begin +540 end +541 internal +542 singleton +543 begin +544 end +545 internal +546 singleton +547 begin +548 end +549 internal +550 singleton +551 begin +552 end +553 internal +554 singleton +555 begin +556 end +557 internal +558 singleton +559 begin +560 end +561 internal +562 singleton +563 begin +564 end +565 internal +566 singleton +567 begin +568 end +569 internal +570 singleton +571 begin +572 end +573 internal +574 singleton +575 begin +576 end +577 internal +578 singleton +579 begin +580 end +581 internal +582 singleton +583 begin +584 end +585 internal +586 singleton +587 begin +588 end +589 internal +590 singleton +591 begin +592 end +593 internal +594 singleton +595 begin +596 end +597 internal +598 singleton +599 begin +600 end +601 internal +602 singleton +603 begin +604 end +605 internal +606 singleton +607 begin +608 end +609 internal +610 singleton +611 begin +612 end +613 internal +614 singleton +615 begin +616 end +617 internal +618 singleton +619 begin +620 end +621 internal +622 singleton +623 begin +624 end +625 internal +626 singleton +627 begin +628 end +629 internal +630 singleton +631 begin +632 end +633 internal +634 singleton +635 begin +636 end +637 internal +638 singleton +639 begin +640 end +641 internal +642 singleton +643 begin +644 end +645 internal +646 singleton diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/final.dubm b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/final.dubm new file mode 100644 index 0000000..bcf2689 Binary files /dev/null and b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/final.dubm differ diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/final.ie b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/final.ie new file mode 100644 index 0000000..e1d78a2 Binary files /dev/null and b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/final.ie differ diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/final.mat b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/final.mat new file mode 100644 index 0000000..1093236 Binary files /dev/null and b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/final.mat differ diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/global_cmvn.stats b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/global_cmvn.stats new file mode 100644 index 0000000..500cc40 --- /dev/null +++ b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/global_cmvn.stats @@ -0,0 +1,3 @@ + [ + 1.117107e+11 -7.827721e+08 -1.101398e+10 -2.193934e+09 -1.347332e+10 -1.613916e+10 -1.199561e+10 -1.255081e+10 -1.638895e+10 -3.821099e+09 -1.372833e+10 -5.244242e+09 -1.098187e+10 -3.655235e+09 -9.364579e+09 -4.285302e+09 -6.296873e+09 -1.552953e+09 -3.176746e+09 -1.202976e+08 -9.857023e+08 2.316555e+08 -1.61059e+08 -5.891868e+07 3.465849e+08 -1.842054e+08 3.248211e+08 -1.483965e+08 3.739239e+08 -6.672061e+08 4.442288e+08 -9.274889e+08 5.142684e+08 4.292036e+07 2.206386e+08 -4.532715e+08 -2.092499e+08 -3.70488e+08 -8.079404e+07 -8.425977e+07 1.344125e+09 + 9.982632e+12 1.02635e+12 8.634624e+11 9.06451e+11 9.652096e+11 1.12772e+12 9.468372e+11 9.141218e+11 9.670484e+11 6.936961e+11 8.141006e+11 6.256321e+11 6.087707e+11 4.616898e+11 4.212042e+11 2.862872e+11 2.498089e+11 1.470856e+11 1.099197e+11 5.780894e+10 3.118114e+10 1.060667e+10 1.466199e+09 4.173056e+08 5.257362e+09 1.277714e+10 2.114478e+10 2.974502e+10 3.587691e+10 4.078971e+10 4.247745e+10 4.382608e+10 4.62521e+10 4.575282e+10 3.546206e+10 3.041531e+10 2.838562e+10 2.258604e+10 1.715295e+10 1.303227e+10 0 ] diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/online_cmvn.conf b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/online_cmvn.conf new file mode 100644 index 0000000..e69de29 diff --git a/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/splice.conf b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/splice.conf new file mode 100644 index 0000000..960cd2e --- /dev/null +++ b/Src/app/build/intermediates/assets/debug/vosk-model-small-cn-0.22/ivector/splice.conf @@ -0,0 +1,2 @@ +--left-context=3 +--right-context=3 diff --git a/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index d077654..ed79ed9 100644 Binary files a/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar b/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar new file mode 100644 index 0000000..df70a92 Binary files /dev/null and b/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar differ diff --git a/Src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/Src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar new file mode 100644 index 0000000..4d2d1fe Binary files /dev/null and b/Src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/README.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/README.jar new file mode 100644 index 0000000..744438b Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/README.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/am/final.mdl.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/am/final.mdl.jar new file mode 100644 index 0000000..8d69a1d Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/am/final.mdl.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/conf/mfcc.conf.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/conf/mfcc.conf.jar new file mode 100644 index 0000000..a3a3f28 Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/conf/mfcc.conf.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/conf/model.conf.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/conf/model.conf.jar new file mode 100644 index 0000000..cab07a5 Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/conf/model.conf.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/Gr.fst.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/Gr.fst.jar new file mode 100644 index 0000000..80e1fcf Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/Gr.fst.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/HCLr.fst.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/HCLr.fst.jar new file mode 100644 index 0000000..50beb5f Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/HCLr.fst.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/disambig_tid.int.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/disambig_tid.int.jar new file mode 100644 index 0000000..d7f4f1f Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/disambig_tid.int.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/phones/word_boundary.int.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/phones/word_boundary.int.jar new file mode 100644 index 0000000..3a017c0 Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/graph/phones/word_boundary.int.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/final.dubm.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/final.dubm.jar new file mode 100644 index 0000000..3d4f42e Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/final.dubm.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/final.ie.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/final.ie.jar new file mode 100644 index 0000000..9bfa57c Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/final.ie.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/final.mat.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/final.mat.jar new file mode 100644 index 0000000..bfc0d65 Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/final.mat.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/global_cmvn.stats.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/global_cmvn.stats.jar new file mode 100644 index 0000000..e008b7b Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/global_cmvn.stats.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/online_cmvn.conf.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/online_cmvn.conf.jar new file mode 100644 index 0000000..52ebf4c Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/online_cmvn.conf.jar differ diff --git a/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/splice.conf.jar b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/splice.conf.jar new file mode 100644 index 0000000..8bde11a Binary files /dev/null and b/Src/app/build/intermediates/compressed_assets/debug/out/assets/vosk-model-small-cn-0.22/ivector/splice.conf.jar differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_0/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_0/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_0/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_0/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_1/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_1/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_1/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_1/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_2/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_2/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_2/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_2/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_3/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_3/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_3/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_3/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_4/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_4/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_4/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_4/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_5/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_5/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_5/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_5/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_6/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_6/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_6/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_6/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_7/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_7/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_7/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_7/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_8/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_8/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_8/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_8/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_9/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_9/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_9/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_9/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_0/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_1/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_2/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_3/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_4/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_4/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_5/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_5/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_6/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_6/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_6/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_7/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_7/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_8/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_8/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_8/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_9/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_9/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/dirs_bucket_9/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_0/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_0/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_1/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_1/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_2/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_2/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_3/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_3/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_4/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_4/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_4/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_5/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_5/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_5/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_6/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_6/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_6/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_7/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_7/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_7/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_8/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_8/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_8/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_9/graph.bin b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_9/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d7248b1ad2ce92ce38c2467c6ec21e6ab04fc9eb2dad64d4d9776ec19f564ff9_bucket_9/graph.bin differ diff --git a/Src/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex b/Src/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex new file mode 100644 index 0000000..d8907f7 Binary files /dev/null and b/Src/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex index 7e6c26c..4f23fcc 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex index e6e6dfb..b0b7fa6 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex index ff7f276..3a36296 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex index 6a6e52e..c89e6bd 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex index f907760..53380b6 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex index abed6d9..b639303 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex new file mode 100644 index 0000000..6a97eda Binary files /dev/null and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debugAndroidTest/mergeProjectDexDebugAndroidTest/0/classes.dex b/Src/app/build/intermediates/dex/debugAndroidTest/mergeProjectDexDebugAndroidTest/0/classes.dex new file mode 100644 index 0000000..fb90e0a Binary files /dev/null and b/Src/app/build/intermediates/dex/debugAndroidTest/mergeProjectDexDebugAndroidTest/0/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debugAndroidTest/mergeProjectDexDebugAndroidTest/13/classes.dex b/Src/app/build/intermediates/dex/debugAndroidTest/mergeProjectDexDebugAndroidTest/13/classes.dex new file mode 100644 index 0000000..13be3cd Binary files /dev/null and b/Src/app/build/intermediates/dex/debugAndroidTest/mergeProjectDexDebugAndroidTest/13/classes.dex differ diff --git a/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 2aeb4de..a1471a2 100644 Binary files a/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/Src/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out b/Src/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out new file mode 100644 index 0000000..489da02 Binary files /dev/null and b/Src/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out differ diff --git a/Src/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out b/Src/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out new file mode 100644 index 0000000..9a03714 --- /dev/null +++ b/Src/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out @@ -0,0 +1 @@ +10 \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/Src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 1c983fc..56d7f55 100644 Binary files a/Src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/Src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/Src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sIw3kEjq6zyTkgsXdbRv_Siw3o4= b/Src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sIw3kEjq6zyTkgsXdbRv_Siw3o4= new file mode 100644 index 0000000..e578050 Binary files /dev/null and b/Src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sIw3kEjq6zyTkgsXdbRv_Siw3o4= differ diff --git a/Src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/suIDDJNBDou8Zj2K5C8Vtxpje8c= b/Src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/suIDDJNBDou8Zj2K5C8Vtxpje8c= new file mode 100644 index 0000000..ff423c8 Binary files /dev/null and b/Src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/suIDDJNBDou8Zj2K5C8Vtxpje8c= differ diff --git a/Src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xSQ5zuVw5lRBqpxts+2RrqlMcYk= b/Src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xSQ5zuVw5lRBqpxts+2RrqlMcYk= new file mode 100644 index 0000000..d180baa Binary files /dev/null and b/Src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xSQ5zuVw5lRBqpxts+2RrqlMcYk= differ diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 24840ab..8831217 100644 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,111 @@ -#Thu Dec 05 20:45:28 CST 2024 -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +#Mon Jan 06 19:32:33 CST 2025 +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/color/text_color_state_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_text_color_state_list.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable/button_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_button_background.xml.flat +net.micode.notes.app-main-7\:/drawable/edittext_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_edittext_background.xml.flat +net.micode.notes.app-main-7\:/drawable/gesture_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_background.xml.flat +net.micode.notes.app-main-7\:/drawable/gesture_button_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_button_background.xml.flat +net.micode.notes.app-main-7\:/drawable/gesture_panel_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_panel_background.xml.flat +net.micode.notes.app-main-7\:/drawable/ic_audio.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat +net.micode.notes.app-main-7\:/drawable/ic_lock_outline.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_lock_outline.xml.flat +net.micode.notes.app-main-7\:/drawable/ic_warning.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_warning.png.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable/toast_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_toast_background.xml.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat +net.micode.notes.app-main-7\:/layout/activity_register.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_register.xml.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/layout/layout_custom_toast.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_layout_custom_toast.xml.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/layout/note_gesture_password.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_password.xml.flat +net.micode.notes.app-main-7\:/layout/note_gesture_verify.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_verify.xml.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗？ - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误，请检查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/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %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/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index a9cf5ee..5f0e031 100644 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -10,6 +10,28 @@ Messaging Email + #FFFFFF + #2196F3 + #FFFFFF + #F5F5F5 + #2196F3 + #80FFFFFF + #FFFFFF + #F44336 + #757575 + #2196F3 + #F44336 + #2196F3 + #2196F3 + #FFFFFF + #E0E0E0 + #F44336 + #E0E0E0 + #2196F3 + #4CAF50 + #333333 + #808080 + #000000 #335b5b5b 26sp 20sp @@ -30,6 +52,9 @@ Notes 4x4 Delete Call notes + 取消 + 确认 + 请再次绘制手势密码确认 cancel set Delete reminder successfully @@ -50,6 +75,19 @@ Export text file (%1$s) to SD (%2$s) directory (%d) Have moved selected %1$d notes to %2$s folder + 您可以通过其他方式重置密码 + 忘记密码？ + 忘记密码 + 请绘制手势密码 + 手势匹配成功 + 手势不匹配，请重试 + 手势密码设置成功 + 手势太短，至少需要4个点 + 图案错误，还可以尝试%d次 + 验证失败次数过多，笔记已锁定 + 验证失败，还剩 %d 次机会 + 请绘制手势密码解锁笔记 + 验证成功 Input name Note added to home Remind me @@ -75,6 +113,7 @@ Nothing selected, the operation is invalid %d selected Send to home + 设置手势密码 Settings Share Sync @@ -89,6 +128,7 @@ Got it Add note ... + 确定 Sync notes with google task Sync account Add account @@ -123,6 +163,18 @@ Syncing notes... No associated note found, click to create associated note. Privacy mode，can not see note content + + + + visible + 短信 邮件 - 便签便签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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消请绘制手势密码请再次绘制手势密码确认手势太短，至少需要4个点手势匹配成功手势不匹配，请重试手势密码设置成功设置手势密码 %1$s 条符合“%2$s”的搜索结果 - + 确认请绘制手势密码解锁笔记验证失败次数过多，笔记已锁定验证失败，还剩 %d 次机会验证成功忘记密码您可以通过其他方式重置密码确定忘记密码？取消图案错误，还可以尝试%d次 短信 郵件 - 便簽便簽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/app/build/intermediates/incremental/debugAndroidTest-mergeJavaRes/merge-state b/Src/app/build/intermediates/incremental/debugAndroidTest-mergeJavaRes/merge-state new file mode 100644 index 0000000..1c983fc Binary files /dev/null and b/Src/app/build/intermediates/incremental/debugAndroidTest-mergeJavaRes/merge-state differ diff --git a/Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties new file mode 100644 index 0000000..39b6311 --- /dev/null +++ b/Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties @@ -0,0 +1 @@ +#Mon Dec 30 21:15:38 CST 2024 diff --git a/Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml new file mode 100644 index 0000000..57beabc --- /dev/null +++ b/Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml new file mode 100644 index 0000000..b7d7806 --- /dev/null +++ b/Src/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml new file mode 100644 index 0000000..79fe105 --- /dev/null +++ b/Src/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml new file mode 100644 index 0000000..bc38452 --- /dev/null +++ b/Src/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 82f5968..d472bb1 100644 --- a/Src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/Src/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/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index eb9178d..e72442e 100644 --- a/Src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/Src/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/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 4bd4fb6..a12967b 100644 --- a/Src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/Src/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/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 220370c..40edb9d 100644 --- a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,18 +1,22 @@ -#Thu Dec 05 20:45:42 CST 2024 -base.0=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex -base.1=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex -base.2=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex -base.3=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex -base.4=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex -base.5=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex -base.6=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex -path.0=0/classes.dex -path.1=11/classes.dex -path.2=12/classes.dex -path.3=13/classes.dex -path.4=15/classes.dex -path.5=4/classes.dex -path.6=5/classes.dex +#Mon Jan 06 20:13:24 CST 2025 +base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex +base.1=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex +base.2=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex +base.3=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex +base.4=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex +base.5=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex +base.6=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex +base.7=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex +base.8=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\8\\classes.dex +path.0=classes.dex +path.1=0/classes.dex +path.2=11/classes.dex +path.3=12/classes.dex +path.4=13/classes.dex +path.5=15/classes.dex +path.6=4/classes.dex +path.7=5/classes.dex +path.8=8/classes.dex renamed.0=classes.dex renamed.1=classes2.dex renamed.2=classes3.dex @@ -20,3 +24,5 @@ renamed.3=classes4.dex renamed.4=classes5.dex renamed.5=classes6.dex renamed.6=classes7.dex +renamed.7=classes8.dex +renamed.8=classes9.dex diff --git a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index fd61682..5415ab0 100644 Binary files a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index 945a7c5..83e539e 100644 Binary files a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt new file mode 100644 index 0000000..bcd40d5 --- /dev/null +++ b/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt @@ -0,0 +1,7 @@ +#Mon Dec 30 21:15:41 CST 2024 +base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex +base.1=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex +path.0=0/classes.dex +path.1=13/classes.dex +renamed.0=classes.dex +renamed.1=classes2.dex diff --git a/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/zip-cache/androidResources b/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/zip-cache/androidResources new file mode 100644 index 0000000..9b02803 Binary files /dev/null and b/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/zip-cache/androidResources differ diff --git a/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/zip-cache/javaResources0 b/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/zip-cache/javaResources0 new file mode 100644 index 0000000..945a7c5 Binary files /dev/null and b/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/zip-cache/javaResources0 differ diff --git a/Src/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt b/Src/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt new file mode 100644 index 0000000..22fef4a --- /dev/null +++ b/Src/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt @@ -0,0 +1 @@ +D:\gitnote\notes\app\build\intermediates\merged_res\debug\color_primary_text_dark.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\color_secondary_text_dark.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\color_text_color_state_list.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_btn_set_color.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_color_btn_mask.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_call_record.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_clock.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_delete.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_dropdown_icon.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_blue.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_green.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_red.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_blue.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_green.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_red.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_white.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_yellow.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_white.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_yellow.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_large.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_normal.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_size_selector_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_small.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_super.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_icon_app.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_background.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_folder.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_footer_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_delete.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_move.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_normal.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_pressed.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_note_edit_color_selector_panel.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_notification.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_search_result.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_selected.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_title_alert.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_title_bar_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_blue.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_green.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_red.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_white.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_yellow.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_blue.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_green.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_red.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_white.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_yellow.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_button_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_edittext_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_ic_audio.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_ic_warning.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_new_note.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_toast_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_account_dialog_title.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_activity_login.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_activity_register.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_add_account_text.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_datetime_picker.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_dialog_edit_text.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_folder_list_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_layout_custom_toast.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_edit_list_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_gesture_password.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list_dropdown_menu.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list_footer.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_settings_header.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_widget_2x.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_widget_4x.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_call_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_call_record_folder.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list_dropdown.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list_options.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_sub_folder.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\raw-zh-rCN_introduction.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\raw_introduction.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values-zh-rCN_values-zh-rCN.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values-zh-rTW_values-zh-rTW.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values_values.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_preferences.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_searchable.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_widget_2x_info.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_widget_4x_info.xml.flat \ No newline at end of file diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index da0b7b9..986a58d 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class index 36c8d49..1a89595 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index 4bfa98f..c8637f9 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class index 64fe9eb..4be696a 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 7eeade4..4b42ebc 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 8c8ad53..2d64390 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/UserDao.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/UserDao.class new file mode 100644 index 0000000..7a40b58 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/UserDao.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 8c28474..9d9accd 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index 2619f4d..ac989dd 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/LoginActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/LoginActivity.class new file mode 100644 index 0000000..a13f134 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/LoginActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/RegisterActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/RegisterActivity.class new file mode 100644 index 0000000..65dae01 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/RegisterActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class index 299f9a1..75809b4 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class index 6cc7740..0225f1c 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index 047a334..b7b0fe2 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index 80c1b84..8581c90 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index 40f3b1c..7d3d293 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class index b52c174..15350a9 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class index 3d5c2ed..cd49e5c 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class index 3cae2c3..960604a 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index 31adf23..0e017c8 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index ce35255..66594fc 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 347dbb2..8387ba6 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 263d701..f7a5576 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class index 274db52..1a9f127 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index fddc6fa..733a6bd 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 928ce77..e6dd700 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$1.class new file mode 100644 index 0000000..31d61a9 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$1.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$2.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$2.class new file mode 100644 index 0000000..266e5ad Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$2.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$OnPatternListener.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$OnPatternListener.class new file mode 100644 index 0000000..6f247d8 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$OnPatternListener.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$Point.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$Point.class new file mode 100644 index 0000000..fc33993 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$Point.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView.class new file mode 100644 index 0000000..8319da2 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 21a6e7c..1e930a8 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 5883e84..55b0d78 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 0c7bd9f..13c0a6a 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class index 5bb29a0..3640884 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class new file mode 100644 index 0000000..a6e7338 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class new file mode 100644 index 0000000..a714437 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class new file mode 100644 index 0000000..af7c646 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class new file mode 100644 index 0000000..668a686 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 2caef51..48209e9 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 2ed7733..4b12b62 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 4c358b1..8e8ded7 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity$1.class new file mode 100644 index 0000000..f64b096 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity$1.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity.class new file mode 100644 index 0000000..ce86b9b Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity$1.class new file mode 100644 index 0000000..48a2774 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity$1.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity.class new file mode 100644 index 0000000..ab0b538 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 4cc4805..11b2c13 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 673953c..6f10c11 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index fcb1b6c..bbadd31 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 789acee..d97b73e 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 8d6ae8a..e62d0c9 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 25b5244..e559d0e 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index d86c020..e96df11 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 5011079..574cc6b 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index d076238..a254504 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index ac17483..d8a5628 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index 432ab5f..85c1e20 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 3f5bb30..79cdd31 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index ee22c5c..6bcf931 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index dd8be63..0058e39 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index c30a7c8..7cf018d 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 40adf05..92fe4c7 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 3697b30..40c200c 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index d19b0c3..05b43e7 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 1a05bac..b6809ea 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 2b687e6..82a2a3b 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index a1679fe..002eb69 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 89a3005..2cdfba1 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index 2313ce1..8d980ae 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index e7ff5a9..6398635 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/Src/app/build/intermediates/javac/debugAndroidTest/classes/net/micode/notes/test/BuildConfig.class b/Src/app/build/intermediates/javac/debugAndroidTest/classes/net/micode/notes/test/BuildConfig.class new file mode 100644 index 0000000..3314cf8 Binary files /dev/null and b/Src/app/build/intermediates/javac/debugAndroidTest/classes/net/micode/notes/test/BuildConfig.class differ diff --git a/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 5b750d6..f797799 100644 --- a/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -1,277 +1,285 @@ 1 -2 -3 -4 -8 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 -9 android:minSdkVersion="21" -9-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:15-41 -10 android:targetSdkVersion="21" /> -10-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 -11 -12 -13 -13-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:5-81 -13-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:22-78 -14 -14-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:5-88 -14-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:22-85 -15 -15-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:16:5-67 -15-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:16:22-64 -16 -16-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:17:5-72 -16-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:17:22-69 -17 -17-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:18:5-74 -17-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:18:22-71 -18 -18-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:19:5-80 -18-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:19:22-77 -19 -19-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:20:5-71 -19-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:20:22-68 -20 -20-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:21:5-74 -20-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:21:22-71 -21 -21-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:22:5-81 -21-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:22:22-78 -22 -23 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:25:5-146:19 -24 android:debuggable="true" -25 android:icon="@drawable/icon_app" -25-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:26:9-42 -26 android:label="@string/app_name" -26-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:27:9-41 -27 android:testOnly="true" > -28 -29 -30 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:29:9-41:20 -31 android:name="net.micode.notes.ui.NotesListActivity" -31-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:30:13-49 -32 android:configChanges="keyboardHidden|orientation|screenSize" -32-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:31:13-74 -33 android:label="@string/app_name" -33-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:32:13-45 -34 android:launchMode="singleTop" -34-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:33:13-43 -35 android:theme="@style/NoteTheme" -35-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:34:13-45 -36 android:uiOptions="splitActionBarWhenNarrow" -36-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:35:13-57 -37 android:windowSoftInputMode="adjustPan" > -37-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:36:13-52 -38 -38-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:37:13-40:29 -39 -39-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:38:17-69 -39-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:38:25-66 -40 -41 -41-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:39:17-77 -41-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:39:27-74 -42 -43 -44 -45 -46 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:44:9-76:20 -47 android:name="net.micode.notes.ui.NoteEditActivity" -47-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:45:13-48 -48 android:configChanges="keyboardHidden|orientation|screenSize" -48-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:46:13-74 -49 android:launchMode="singleTop" -49-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:47:13-43 -50 android:theme="@style/NoteTheme" > -50-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:48:13-45 -51 -52 -53 -53-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:13-58:29 -53-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:51:17-38 -54 -54-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:53:17-69 -54-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:53:25-66 -55 -56 -56-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:17-76 -56-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:27-73 -57 -58 -58-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:17-78 -58-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:23-75 -59 -59-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:17-78 -59-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:23-75 -60 -61 -62 -62-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:60:13-66:29 -63 -63-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:61:17-79 -63-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:61:25-76 +2 +6 +7 D:\gitnote\notes\app\src\main\AndroidManifest.xml +9 android:targetSdkVersion="21" /> +9-->D:\gitnote\notes\app\src\main\AndroidManifest.xml +10 +11 +12 +12-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:9:5-71 +12-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:9:22-68 +13 +13-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:10:5-80 +13-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:10:22-77 +14 +14-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:11:5-81 +14-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:11:22-78 +15 +15-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:12:5-80 +15-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:12:22-77 +16 +16-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:13:5-67 +16-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:13:22-64 +17 +17-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:14:5-72 +17-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:14:22-69 +18 +18-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:5-81 +18-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:22-78 +19 +20 D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-145:19 +21 android:debuggable="true" +22 android:icon="@drawable/icon_app" +22-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:18:9-42 +23 android:label="@string/app_name" +23-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41 +24 android:testOnly="true" > +25 +26 +27 D:\gitnote\notes\app\src\main\AndroidManifest.xml:22:9-29:20 +28 android:name="net.micode.notes.login.LoginActivity" +28-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:23:13-48 +29 android:launchMode="singleTop" > +29-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:24:13-43 +30 +30-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:25:13-28:29 +31 +31-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:17-69 +31-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:25-66 +32 +33 +33-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:17-77 +33-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:27-74 +34 +35 +36 +37 +38 +38-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:9-60 +38-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:19-57 +39 +40 D:\gitnote\notes\app\src\main\AndroidManifest.xml:34:9-40:55 +41 android:name="net.micode.notes.ui.NotesListActivity" +41-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:35:13-49 +42 android:configChanges="keyboardHidden|orientation|screenSize" +42-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:36:13-74 +43 android:label="@string/app_name" +43-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:37:13-45 +44 android:launchMode="singleTop" +44-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:38:13-43 +45 android:theme="@style/NoteTheme" +45-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:39:13-45 +46 android:windowSoftInputMode="adjustPan" /> +46-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:40:13-52 +47 D:\gitnote\notes\app\src\main\AndroidManifest.xml:41:9-44:70 +48 android:name="net.micode.notes.ui.NoteGesturePasswordActivity" +48-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:42:13-59 +49 android:label="@string/menu_set_gesture" +49-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:43:13-53 +50 android:theme="@android:style/Theme.Holo.Light.Dialog" /> +50-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:44:13-67 +51 D:\gitnote\notes\app\src\main\AndroidManifest.xml:45:9-49:63 +52 android:name="net.micode.notes.ui.NoteGestureVerifyActivity" +52-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57 +53 android:screenOrientation="portrait" +53-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:48:13-49 +54 android:theme="@style/GestureVerifyTheme" +54-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54 +55 android:windowSoftInputMode="stateAlwaysHidden" /> +55-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:49:13-60 +56 +57 D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-77:20 +58 android:name="net.micode.notes.ui.NoteEditActivity" +58-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:52:13-48 +59 android:configChanges="keyboardHidden|orientation|screenSize" +59-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:13-74 +60 android:launchMode="singleTop" +60-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:54:13-43 +61 android:theme="@style/NoteTheme" > +61-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-45 +62 +62-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-63:29 +62-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:17-38 +63 +63-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-69 +63-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:25-66 64 65 -65-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:17-76 -65-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:27-73 +65-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-76 +65-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:27-73 66 67 -67-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:17-78 -67-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:23-75 +67-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78 +67-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75 68 -68-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:17-78 -68-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:23-75 +68-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78 +68-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75 69 -70 -71 -71-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:68:13-71:29 -72 -72-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:69:17-71 -72-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:69:25-68 -73 -74 -74-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:17-76 -74-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:27-73 -75 -76 -77 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:73:13-75:54 -78 android:name="android.app.searchable" -78-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:74:17-54 -79 android:resource="@xml/searchable" /> -79-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:75:17-51 -80 -81 -82 -83 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:79:9-82:43 -84 android:name="net.micode.notes.data.NotesProvider" -84-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:80:13-63 -85 android:authorities="micode_notes" -85-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:81:13-47 -86 android:multiprocess="true" /> -86-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:82:13-40 -87 -88 -89 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:85:9-96:20 -90 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -90-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:86:13-57 -91 android:label="@string/app_widget2x2" > -91-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:87:13-50 -92 -92-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:88:13-92:29 -93 -93-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:17-84 -93-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:25-81 -94 -94-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:17-85 -94-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:25-82 -95 -95-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:17-85 -95-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:25-82 -96 -97 -98 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:93:13-95:58 -99 android:name="android.appwidget.provider" -99-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:94:17-58 -100 android:resource="@xml/widget_2x_info" /> -100-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:95:17-55 -101 -102 -103 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:98:9-109:20 -104 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -104-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:99:13-57 -105 android:label="@string/app_widget4x4" > -105-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:100:13-50 -106 -106-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:88:13-92:29 -107 -107-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:17-84 -107-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:25-81 -108 -108-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:17-85 -108-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:25-82 -109 -109-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:17-85 -109-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:25-82 -110 -111 -112 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:93:13-95:58 -113 android:name="android.appwidget.provider" -113-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:94:17-58 -114 android:resource="@xml/widget_4x_info" /> -114-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:95:17-55 -115 -116 -117 -118 -118-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:112:9-116:20 -118-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:112:19-55 -119 -119-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:113:13-115:29 -120 -120-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:114:17-79 -120-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:114:25-76 -121 -122 -123 -124 -125 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:119:9-121:50 -126 android:name="net.micode.notes.ui.AlarmReceiver" -126-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:120:13-61 -127 android:process=":remote" /> -127-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:121:13-38 -128 -129 -130 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:124:9-128:87 -131 android:name="net.micode.notes.ui.AlarmAlertActivity" -131-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:125:13-50 -132 android:label="@string/app_name" -132-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:126:13-45 -133 android:launchMode="singleInstance" -133-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:127:13-48 -134 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> -134-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:128:13-75 -135 -136 -137 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:131:9-135:72 -138 android:name="net.micode.notes.ui.NotesPreferenceActivity" -138-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:132:13-71 -139 android:label="@string/preferences_title" -139-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:133:13-54 -140 android:launchMode="singleTop" -140-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:134:13-43 -141 android:theme="@android:style/Theme.Holo.Light" /> -141-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:135:13-60 -142 -143 -144 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:138:9-140:48 -145 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -145-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:139:13-74 -146 android:exported="false" /> -146-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:140:13-37 -147 -148 -149 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:143:9-145:52 -150 android:name="android.app.default_searchable" -150-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:144:13-58 -151 android:value=".ui.NoteEditActivity" /> -151-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:145:13-49 -152 -153 -154 +70 +70-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:64:13-69:29 +71 +71-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:17-79 +71-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:25-76 +72 +73 +73-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-76 +73-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:27-73 +74 +75 +75-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78 +75-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75 +76 +76-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78 +76-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75 +77 +78 +78-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:70:13-73:29 +79 +79-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:17-71 +79-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:25-68 +80 +81 +81-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-76 +81-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:27-73 +82 +83 +84 D:\gitnote\notes\app\src\main\AndroidManifest.xml:74:13-76:54 +85 android:name="android.app.searchable" +85-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:75:17-54 +86 android:resource="@xml/searchable" /> +86-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:17-51 +87 +88 +89 +90 D:\gitnote\notes\app\src\main\AndroidManifest.xml:80:9-83:43 +91 android:name="net.micode.notes.data.NotesProvider" +91-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:81:13-63 +92 android:authorities="micode_notes" +92-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:13-47 +93 android:multiprocess="true" /> +93-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-40 +94 +95 +96 D:\gitnote\notes\app\src\main\AndroidManifest.xml:86:9-96:20 +97 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +97-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:87:13-57 +98 android:label="@string/app_widget2x2" > +98-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:13-50 +99 +99-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-92:29 +100 +100-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:17-84 +100-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:25-81 +101 +101-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:17-85 +101-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:25-82 +102 +103 +104 D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:13-95:58 +105 android:name="android.appwidget.provider" +105-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:94:17-58 +106 android:resource="@xml/widget_2x_info" /> +106-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:17-55 +107 +108 D:\gitnote\notes\app\src\main\AndroidManifest.xml:98:9-108:20 +109 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +109-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:99:13-57 +110 android:label="@string/app_widget4x4" > +110-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:13-50 +111 +111-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-92:29 +112 +112-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:17-84 +112-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:25-81 +113 +113-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:17-85 +113-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:25-82 +114 +115 +116 D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:13-95:58 +117 android:name="android.appwidget.provider" +117-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:94:17-58 +118 android:resource="@xml/widget_4x_info" /> +118-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:17-55 +119 +120 +121 +122 +122-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:9-115:20 +122-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:19-55 +123 +123-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:112:13-114:29 +124 +124-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:17-79 +124-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:25-76 +125 +126 +127 +128 +129 D:\gitnote\notes\app\src\main\AndroidManifest.xml:118:9-120:41 +130 android:name="net.micode.notes.ui.AlarmReceiver" +130-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:119:13-61 +131 android:process=":remote" /> +131-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:13-38 +132 +133 +134 D:\gitnote\notes\app\src\main\AndroidManifest.xml:123:9-127:87 +135 android:name="net.micode.notes.ui.AlarmAlertActivity" +135-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:124:13-50 +136 android:label="@string/app_name" +136-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:13-45 +137 android:launchMode="singleInstance" +137-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-48 +138 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> +138-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-75 +139 +140 +141 D:\gitnote\notes\app\src\main\AndroidManifest.xml:130:9-134:72 +142 android:name="net.micode.notes.ui.NotesPreferenceActivity" +142-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:131:13-71 +143 android:label="@string/preferences_title" +143-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:13-54 +144 android:launchMode="singleTop" +144-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-43 +145 android:theme="@android:style/Theme.Holo.Light" /> +145-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-60 +146 +147 +148 D:\gitnote\notes\app\src\main\AndroidManifest.xml:137:9-139:40 +149 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +149-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:138:13-74 +150 android:exported="false" /> +150-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:13-37 +151 +152 +153 D:\gitnote\notes\app\src\main\AndroidManifest.xml:142:9-144:52 +154 android:name="android.app.default_searchable" +154-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:143:13-58 +155 android:value=".ui.NoteEditActivity" /> +155-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:13-49 +156 +157 +158 diff --git a/Src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/Src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt new file mode 100644 index 0000000..bcf6df6 --- /dev/null +++ b/Src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt @@ -0,0 +1,32 @@ +1 +2 +4 +5 D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:5:5-74 +6 android:minSdkVersion="21" +6-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:5:15-41 +7 android:targetSdkVersion="21" /> +7-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:5:42-71 +8 +9 D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:11:5-15:66 +10 android:name="android.test.InstrumentationTestRunner" +10-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:11:22-75 +11 android:functionalTest="false" +11-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:14:22-52 +12 android:handleProfiling="false" +12-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:13:22-53 +13 android:label="Tests for net.micode.notes" +13-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:15:22-64 +14 android:targetPackage="net.micode.notes" /> +14-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:12:22-62 +15 +16 +16-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:7:5-9:19 +17 +17-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:8:9-60 +17-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:8:23-57 +18 +19 +20 diff --git a/Src/app/build/intermediates/merged_java_res/debug/base.jar b/Src/app/build/intermediates/merged_java_res/debug/base.jar index 15cb0ec..2f8df68 100644 Binary files a/Src/app/build/intermediates/merged_java_res/debug/base.jar and b/Src/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/Src/app/build/intermediates/merged_java_res/debugAndroidTest/feature-app.jar b/Src/app/build/intermediates/merged_java_res/debugAndroidTest/feature-app.jar new file mode 100644 index 0000000..15cb0ec Binary files /dev/null and b/Src/app/build/intermediates/merged_java_res/debugAndroidTest/feature-app.jar differ diff --git a/Src/app/build/intermediates/merged_jni_libs/debug/out/arm64-v8a/libjnidispatch.so b/Src/app/build/intermediates/merged_jni_libs/debug/out/arm64-v8a/libjnidispatch.so new file mode 100644 index 0000000..61553b2 Binary files /dev/null and b/Src/app/build/intermediates/merged_jni_libs/debug/out/arm64-v8a/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/merged_jni_libs/debug/out/arm64-v8a/libvosk.so b/Src/app/build/intermediates/merged_jni_libs/debug/out/arm64-v8a/libvosk.so new file mode 100644 index 0000000..0746b58 Binary files /dev/null and b/Src/app/build/intermediates/merged_jni_libs/debug/out/arm64-v8a/libvosk.so differ diff --git a/Src/app/build/intermediates/merged_jni_libs/debug/out/armeabi-v7a/libjnidispatch.so b/Src/app/build/intermediates/merged_jni_libs/debug/out/armeabi-v7a/libjnidispatch.so new file mode 100644 index 0000000..0683481 Binary files /dev/null and b/Src/app/build/intermediates/merged_jni_libs/debug/out/armeabi-v7a/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/merged_jni_libs/debug/out/armeabi-v7a/libvosk.so b/Src/app/build/intermediates/merged_jni_libs/debug/out/armeabi-v7a/libvosk.so new file mode 100644 index 0000000..d2daebf Binary files /dev/null and b/Src/app/build/intermediates/merged_jni_libs/debug/out/armeabi-v7a/libvosk.so differ diff --git a/Src/app/build/intermediates/merged_jni_libs/debug/out/x86/libjnidispatch.so b/Src/app/build/intermediates/merged_jni_libs/debug/out/x86/libjnidispatch.so new file mode 100644 index 0000000..8587fdf Binary files /dev/null and b/Src/app/build/intermediates/merged_jni_libs/debug/out/x86/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/merged_jni_libs/debug/out/x86/libvosk.so b/Src/app/build/intermediates/merged_jni_libs/debug/out/x86/libvosk.so new file mode 100644 index 0000000..6ffc041 Binary files /dev/null and b/Src/app/build/intermediates/merged_jni_libs/debug/out/x86/libvosk.so differ diff --git a/Src/app/build/intermediates/merged_jni_libs/debug/out/x86_64/libjnidispatch.so b/Src/app/build/intermediates/merged_jni_libs/debug/out/x86_64/libjnidispatch.so new file mode 100644 index 0000000..e3475dc Binary files /dev/null and b/Src/app/build/intermediates/merged_jni_libs/debug/out/x86_64/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/merged_jni_libs/debug/out/x86_64/libvosk.so b/Src/app/build/intermediates/merged_jni_libs/debug/out/x86_64/libvosk.so new file mode 100644 index 0000000..3ecff4c Binary files /dev/null and b/Src/app/build/intermediates/merged_jni_libs/debug/out/x86_64/libvosk.so differ diff --git a/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 3020499..126fea6 100644 --- a/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -1,40 +1,32 @@ - - + android:versionName="0.1" > + + + - + - - - - - + - + + android:name="net.micode.notes.login.LoginActivity" + android:launchMode="singleTop" > @@ -42,14 +34,31 @@ + + + + + + - - @@ -58,7 +67,6 @@ - @@ -67,13 +75,12 @@ - - + @@ -85,28 +92,25 @@ android:authorities="micode_notes" android:multiprocess="true" /> - + - - - - + diff --git a/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 3020499..126fea6 100644 --- a/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -1,40 +1,32 @@ - - + android:versionName="0.1" > + + + - + - - - - - + - + + android:name="net.micode.notes.login.LoginActivity" + android:launchMode="singleTop" > @@ -42,14 +34,31 @@ + + + + + + - - @@ -58,7 +67,6 @@ - @@ -67,13 +75,12 @@ - - + @@ -85,28 +92,25 @@ android:authorities="micode_notes" android:multiprocess="true" /> - + - - - - + diff --git a/Src/app/build/intermediates/merged_native_libs/debug/out/lib/arm64-v8a/libjnidispatch.so b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/arm64-v8a/libjnidispatch.so new file mode 100644 index 0000000..61553b2 Binary files /dev/null and b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/arm64-v8a/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/merged_native_libs/debug/out/lib/arm64-v8a/libvosk.so b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/arm64-v8a/libvosk.so new file mode 100644 index 0000000..0746b58 Binary files /dev/null and b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/arm64-v8a/libvosk.so differ diff --git a/Src/app/build/intermediates/merged_native_libs/debug/out/lib/armeabi-v7a/libjnidispatch.so b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/armeabi-v7a/libjnidispatch.so new file mode 100644 index 0000000..0683481 Binary files /dev/null and b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/armeabi-v7a/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/merged_native_libs/debug/out/lib/armeabi-v7a/libvosk.so b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/armeabi-v7a/libvosk.so new file mode 100644 index 0000000..d2daebf Binary files /dev/null and b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/armeabi-v7a/libvosk.so differ diff --git a/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86/libjnidispatch.so b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86/libjnidispatch.so new file mode 100644 index 0000000..8587fdf Binary files /dev/null and b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86/libvosk.so b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86/libvosk.so new file mode 100644 index 0000000..6ffc041 Binary files /dev/null and b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86/libvosk.so differ diff --git a/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86_64/libjnidispatch.so b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86_64/libjnidispatch.so new file mode 100644 index 0000000..e3475dc Binary files /dev/null and b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86_64/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86_64/libvosk.so b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86_64/libvosk.so new file mode 100644 index 0000000..3ecff4c Binary files /dev/null and b/Src/app/build/intermediates/merged_native_libs/debug/out/lib/x86_64/libvosk.so differ diff --git a/Src/app/build/intermediates/merged_res/debug/color_text_color_state_list.xml.flat b/Src/app/build/intermediates/merged_res/debug/color_text_color_state_list.xml.flat new file mode 100644 index 0000000..cfa7489 Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/color_text_color_state_list.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_button_background.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_button_background.xml.flat new file mode 100644 index 0000000..d1e7c8e Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_button_background.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_edittext_background.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_edittext_background.xml.flat new file mode 100644 index 0000000..122a7d0 Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_edittext_background.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_gesture_background.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_gesture_background.xml.flat new file mode 100644 index 0000000..2e8acaf Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_gesture_background.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_gesture_button_background.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_gesture_button_background.xml.flat new file mode 100644 index 0000000..12e10d0 Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_gesture_button_background.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_gesture_panel_background.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_gesture_panel_background.xml.flat new file mode 100644 index 0000000..ce8acaf Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_gesture_panel_background.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_ic_audio.png.flat b/Src/app/build/intermediates/merged_res/debug/drawable_ic_audio.png.flat new file mode 100644 index 0000000..c8328c5 Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_ic_audio.png.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_ic_lock_outline.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_ic_lock_outline.xml.flat new file mode 100644 index 0000000..880e8dc Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_ic_lock_outline.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_ic_warning.png.flat b/Src/app/build/intermediates/merged_res/debug/drawable_ic_warning.png.flat new file mode 100644 index 0000000..c271409 Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_ic_warning.png.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_toast_background.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_toast_background.xml.flat new file mode 100644 index 0000000..410daec Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_toast_background.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat new file mode 100644 index 0000000..fae5476 Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/layout_activity_register.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_activity_register.xml.flat new file mode 100644 index 0000000..ce2908e Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/layout_activity_register.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/layout_layout_custom_toast.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_layout_custom_toast.xml.flat new file mode 100644 index 0000000..4661faf Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/layout_layout_custom_toast.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index 3a30f02..824fb67 100644 Binary files a/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/layout_note_gesture_password.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_note_gesture_password.xml.flat new file mode 100644 index 0000000..09da9d2 Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/layout_note_gesture_password.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/layout_note_gesture_verify.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_note_gesture_verify.xml.flat new file mode 100644 index 0000000..57efd25 Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/layout_note_gesture_verify.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat index a3e8ee9..5d82acd 100644 Binary files a/Src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/Src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/Src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat index efbd262..2e68623 100644 Binary files a/Src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/Src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/Src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 035ddcd..42b8bae 100644 Binary files a/Src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/Src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/Src/app/build/intermediates/merged_res/debug/values_values.arsc.flat index ea0ebfc..13e8753 100644 Binary files a/Src/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/Src/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 2ccce0f..cc45795 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,36 +1,56 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.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", - "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" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-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", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } }, { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,135,136,-1,-1,-1,-1,-1,133,-1,-1,-1,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,-1,-1,-1,-1,-1,4,-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,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", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7525,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7426,7315,7372,-1,-1,-1,-1,-1,7196,-1,-1,-1,7259,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7491,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,56,53,-1,-1,-1,-1,-1,62,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,7558,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7486,7367,7421,-1,-1,-1,-1,-1,7254,-1,-1,-1,7310,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,922,969,1033,1087,1137,1199,1267,1344,1403,1468,1531,1586,1646,1709,1763,1823,1876,1938,2023,2104,2169,2226,2280,2336,2387,2445,2503,2562,2625,2692,2761,2821,2877,2927,2986,3029,3082,3125,3176,3226,3286,3339,3390,3436,3484,3532,3578,3625,3675,3720,3779,3831,3883,3926,3973,4029,4084,4139,4191,4235,4277,4318,4368,4427,4478,4527,4576,4623,4670,4717,4762,4813,4866,4900,4975,5034,5091,5165,5229,5298,5376,5486,5590,5663,5729,5784,5849,5914,5963,6046,6124,6162,6207,6255,6317,6374,6429,6488,6555,6613,6675,6723,6768,6816,6867,6933", + "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,119,120,121,122,123,124", + "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,917,964,1028,1082,1132,1194,1262,1339,1398,1463,1526,1581,1641,1704,1758,1818,1871,1933,2018,2099,2164,2221,2275,2331,2382,2440,2498,2557,2620,2687,2756,2816,2872,2922,2981,3024,3077,3120,3171,3221,3281,3334,3385,3431,3479,3527,3573,3620,3670,3715,3774,3826,3878,3921,3968,4024,4079,4134,4186,4230,4272,4313,4363,4422,4473,4522,4571,4618,4665,4712,4757,4808,4861,4895,4970,5029,5086,5160,5224,5293,5371,5481,5585,5658,5724,5779,5844,5909,5958,6041,6119,6157,6202,6250,6312,6369,6424,6483,6550,6608,6670,6718,6763,6811,6862,6928,6994" + } + } + ] + }, + { + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "16", "startColumns": "4", - "startOffsets": "336", + "startOffsets": "333", "endLines": "19", "endColumns": "19", - "endOffsets": "441" + "endOffsets": "438" }, "to": { "startLines": "2", @@ -40,6 +60,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\gitnote\\notes\\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", + "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" + }, + "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" + } } ] }, @@ -47,62 +86,129 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "15,17,19,21,13", - "startColumns": "4,4,4,4,4", - "startOffsets": "335,409,484,558,262", - "endColumns": "51,52,52,51,51", - "endOffsets": "382,457,532,605,309" + "startLines": "-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", + "startOffsets": "-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": "13,14,15,16,17", + "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594", + "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,56", + "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1646" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "40,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "1913,2266,2362,2445,2541,2610,2653,2705,2757,2806,2869,2907,2954,3018,3076,3127,3211,3305,3413,3484,3568,3651,3717,3800,3902,3963,4025,4076,4154,4207,4267,4372,4431,4533,4598,4655,4709,4765,4816,4874,4932,4991,5054,5121,5190,5250,5306,5361,5432,5481,5539,5586,5645,5702,5773,5834,5891,5941,5993,6046,6096,6146,6206,6259,6325,6387,6450,6497,6552,6640,6698,6760,6812,6862,6907,6950,7010,7077,7132,7187,7240,7287,7340,7396,7444,7499,7552,7586,7670,7737,7801,7897,7971,8052,8141,8304,8448,8527,8602,8684,8743,8823,8903,8958,9080,9183,9224,9277,9334,9408,9473,9541,9627,9707,9776,9870,9929,9984,10046,10106,10216", + "endLines": "44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164", + "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,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": "2261,2357,2440,2536,2605,2648,2700,2752,2801,2864,2902,2949,3013,3071,3122,3206,3300,3408,3479,3563,3646,3712,3795,3897,3958,4020,4071,4149,4202,4262,4367,4426,4528,4593,4650,4704,4760,4811,4869,4927,4986,5049,5116,5185,5245,5301,5356,5427,5476,5534,5581,5640,5697,5768,5829,5886,5936,5988,6041,6091,6141,6201,6254,6320,6382,6445,6492,6547,6635,6693,6755,6807,6857,6902,6945,7005,7072,7127,7182,7235,7282,7335,7391,7439,7494,7547,7581,7665,7732,7796,7892,7966,8047,8136,8299,8443,8522,8597,8679,8738,8818,8898,8953,9075,9178,9219,9272,9329,9403,9468,9536,9622,9702,9771,9865,9924,9979,10041,10101,10211,10301" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,76,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,4,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,3030,-1,-1,2507,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,82,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,12,-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,3432,-1,-1,2720,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "165,170,177,181,185,189,192,196,200,204,208,212,216", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "10306,10584,10991,11199,11410,11575,11735,11918,12103,12288,12491,12697,12880", + "endLines": "169,176,180,184,188,191,195,199,203,207,211,215,219", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "10579,10986,11194,11405,11570,11730,11913,12098,12283,12486,12692,12875,13076" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "35,36,37,38,39", "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", + "startOffsets": "1651,1703,1756,1809,1861", "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "endOffsets": "1698,1751,1804,1856,1908" } - }, + } + ] + }, + { + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", + "map": [ { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.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" + "startLines": "17,19,18,20,21,16", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "388,515,451,574,632,331", + "endColumns": "50,46,51,44,44,56", + "endOffsets": "434,557,498,614,672,383" }, "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + "startLines": "12,13,14,15,16,17", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "420,471,518,570,615,660", + "endColumns": "50,46,51,44,44,56", + "endOffsets": "466,513,565,610,655,712" } }, { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "49,55,66,61,15,20,25,31,37,10,43", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "1798,2043,2507,2299,421,628,837,1066,1314,215,1560", - "endLines": "52,58,69,63,18,23,28,34,40,13,46", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2001,2249,2710,2454,599,808,1017,1264,1515,393,1756" + "startLines": "136,72,75,74,73,19,20,21,118,119,130,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,132,133,134,131,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,135,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,126,124,123,125,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,4,4,4,4,4,4,4", + "startOffsets": "8407,3898,4159,4063,3994,827,870,922,7506,7555,8065,7951,7900,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,8009,8188,8239,8297,8129,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,8355,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,7859,7732,7675,7785,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "140,72,75,74,73,19,20,21,118,119,130,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,132,133,134,131,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,135,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,126,124,123,125,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,55,50,57,57,58,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,51,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": "8811,3989,4237,4154,4058,865,917,969,7550,7613,8124,8004,7946,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,8060,8234,8292,8350,8183,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,8402,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,7895,7780,7727,7854,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8332,8543,8750,8910,9093,9278,9463,9666,9872,10055", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8327,8538,8745,8905,9088,9273,9458,9661,9867,10050,10251" + "startLines": "23,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,125,126,127,128,129,130,131,132,133,134,135,136", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "979,1332,1428,1511,1607,1676,1719,1771,1823,1872,1935,1999,2057,2108,2192,2286,2394,2465,2549,2632,2698,2781,2883,2944,3006,3057,3135,3188,3248,3353,3412,3514,3570,3621,3679,3737,3796,3851,3922,3971,4029,4076,4135,4192,4263,4324,4381,4431,4483,4536,4586,4636,4696,4749,4815,4877,4940,4987,5042,5130,5188,5250,5302,5352,5397,5440,5500,5567,5622,5677,5730,5777,5830,5886,5934,5989,6042,6126,6193,6257,6353,6427,6508,6597,6760,6904,6983,7058,7140,7199,7279,7359,7414,7536,7639,7680,7733,7790,7864,7929,7997,8083,8163,8232,8326,8385,8440,8502,8562,8672", + "endLines": "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,125,126,127,128,129,130,131,132,133,134,135,136", + "endColumns": "14,95,82,95,68,42,51,51,48,62,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,55,50,57,57,58,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,51,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": "1327,1423,1506,1602,1671,1714,1766,1818,1867,1930,1994,2052,2103,2187,2281,2389,2460,2544,2627,2693,2776,2878,2939,3001,3052,3130,3183,3243,3348,3407,3509,3565,3616,3674,3732,3791,3846,3917,3966,4024,4071,4130,4187,4258,4319,4376,4426,4478,4531,4581,4631,4691,4744,4810,4872,4935,4982,5037,5125,5183,5245,5297,5347,5392,5435,5495,5562,5617,5672,5725,5772,5825,5881,5929,5984,6037,6121,6188,6252,6348,6422,6503,6592,6755,6899,6978,7053,7135,7194,7274,7354,7409,7531,7634,7675,7728,7785,7859,7924,7992,8078,8158,8227,8321,8380,8435,8497,8557,8667,8757" } }, { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "10,18", "startColumns": "4,4", @@ -121,63 +227,39 @@ } }, { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "16", - "startColumns": "4", - "startOffsets": "331", - "endColumns": "56", - "endOffsets": "383" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.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", - "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" + "startLines": "71,49,55,66,61,15,20,25,31,37,10,43", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2752,1798,2043,2507,2299,421,628,837,1066,1314,215,1560", + "endLines": "75,52,58,69,63,18,23,28,34,40,13,46", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "3025,2001,2249,2720,2454,599,808,1017,1264,1515,393,1756" }, "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" + "startLines": "137,142,146,150,154,157,161,165,169,173,177,181", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8762,9040,9248,9459,9624,9784,9967,10152,10337,10540,10746,10929", + "endLines": "141,145,149,153,156,160,164,168,172,176,180,184", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "9035,9243,9454,9619,9779,9962,10147,10332,10535,10741,10924,11125" } }, { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "16", - "startColumns": "4", - "startOffsets": "333", - "endLines": "19", - "endColumns": "19", - "endOffsets": "438" + "startLines": "15,17,19,21,13", + "startColumns": "4,4,4,4,4", + "startOffsets": "335,409,484,558,262", + "endColumns": "51,52,52,51,51", + "endOffsets": "382,457,532,605,309" }, "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startLines": "18,19,20,21,22", + "startColumns": "4,4,4,4,4", + "startOffsets": "717,769,822,875,927", + "endColumns": "51,52,52,51,51", + "endOffsets": "764,817,870,922,974" } } ] diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index b29749a..c8e9259 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,26 +4,46 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.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", - "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" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-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", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } }, { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,135,136,-1,-1,-1,-1,-1,133,-1,-1,-1,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,-1,-1,-1,-1,-1,4,-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,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", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7525,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7426,7315,7372,-1,-1,-1,-1,-1,7196,-1,-1,-1,7259,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7491,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,56,53,-1,-1,-1,-1,-1,62,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,7558,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7486,7367,7421,-1,-1,-1,-1,-1,7254,-1,-1,-1,7310,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,922,969,1033,1087,1137,1199,1267,1344,1403,1468,1531,1586,1646,1709,1763,1823,1876,1938,2023,2104,2169,2226,2280,2336,2387,2445,2503,2562,2625,2692,2761,2821,2877,2927,2986,3029,3082,3125,3176,3226,3286,3339,3390,3436,3484,3532,3578,3625,3675,3720,3779,3831,3883,3926,3973,4029,4084,4139,4191,4235,4277,4318,4368,4427,4478,4527,4576,4623,4670,4717,4762,4813,4866,4900,4975,5034,5091,5165,5229,5298,5376,5486,5590,5663,5729,5784,5849,5914,5963,6046,6124,6162,6207,6255,6317,6374,6429,6488,6555,6613,6675,6723,6768,6816,6867,6933", + "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,119,120,121,122,123,124", + "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,917,964,1028,1082,1132,1194,1262,1339,1398,1463,1526,1581,1641,1704,1758,1818,1871,1933,2018,2099,2164,2221,2275,2331,2382,2440,2498,2557,2620,2687,2756,2816,2872,2922,2981,3024,3077,3120,3171,3221,3281,3334,3385,3431,3479,3527,3573,3620,3670,3715,3774,3826,3878,3921,3968,4024,4079,4134,4186,4230,4272,4313,4363,4422,4473,4522,4571,4618,4665,4712,4757,4808,4861,4895,4970,5029,5086,5160,5224,5293,5371,5481,5585,5658,5724,5779,5844,5909,5958,6041,6119,6157,6202,6250,6312,6369,6424,6483,6550,6608,6670,6718,6763,6811,6862,6928,6994" + } + } + ] + }, + { + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml", + "map": [ + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "16", "startColumns": "4", @@ -40,6 +60,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "128,71,70,69,68,19,20,21,112,113,122,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,121,124,125,126,123,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,127,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,4,4,4,4,4,4,4", + "startOffsets": "6930,3495,3429,3356,3306,827,867,915,6083,6128,6588,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6532,6711,6762,6820,6652,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,6878,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", + "endLines": "130,71,70,69,68,19,20,21,112,113,122,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,121,124,125,126,123,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,127,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,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,55,50,57,57,58,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,51,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": "7102,3563,3490,3424,3351,862,910,958,6123,6180,6647,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6583,6757,6815,6873,6706,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,6925,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" + }, + "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", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,948,1002,1052,1114,1182,1259,1318,1383,1446,1501,1561,1624,1678,1738,1791,1853,1938,2019,2075,2126,2184,2242,2301,2351,2410,2453,2506,2549,2600,2650,2710,2763,2814,2860,2908,2956,3002,3049,3099,3144,3203,3255,3307,3350,3397,3453,3508,3563,3615,3659,3701,3742,3792,3851,3902,3951,4000,4047,4094,4141,4186,4237,4290,4365,4424,4481,4555,4619,4688,4766,4876,4980,5053,5119,5174,5239,5304,5353,5436,5514,5552,5597,5645,5707,5764,5819,5878,5945,6003,6065,6113,6158,6206,6257,6323", + "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", + "endColumns": "14,72,65,72,49,39,47,47,44,56,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,55,50,57,57,58,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,943,997,1047,1109,1177,1254,1313,1378,1441,1496,1556,1619,1673,1733,1786,1848,1933,2014,2070,2121,2179,2237,2296,2346,2405,2448,2501,2544,2595,2645,2705,2758,2809,2855,2903,2951,2997,3044,3094,3139,3198,3250,3302,3345,3392,3448,3503,3558,3610,3654,3696,3737,3787,3846,3897,3946,3995,4042,4089,4136,4181,4232,4285,4360,4419,4476,4550,4614,4683,4761,4871,4975,5048,5114,5169,5234,5299,5348,5431,5509,5547,5592,5640,5702,5759,5814,5873,5940,5998,6060,6108,6153,6201,6252,6318,6384" + } } ] } diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index f154996..f47a7b2 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\github\\XiaoMiNote\\Src\\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", - "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" - }, - "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" - } - }, - { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "16", "startColumns": "4", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\gitnote\\notes\\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", + "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" + }, + "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" + } } ] } diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index fd64a3d..878d4e7 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,72 +1,133 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", "map": [ { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "15,17,19,21,13", - "startColumns": "4,4,4,4,4", - "startOffsets": "335,409,484,558,262", - "endColumns": "51,52,52,51,51", - "endOffsets": "382,457,532,605,309" + "startLines": "-1,-1,-1,23,27,29,28,38,40,36,34,33,37,24,25,32,30,31,39,26,-1,-1,-1", + "startColumns": "-1,-1,-1,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,-1,-1,-1", + "startOffsets": "-1,-1,-1,711,931,1045,991,1504,1614,1398,1323,1269,1451,764,823,1215,1103,1158,1558,878,-1,-1,-1", + "endColumns": "-1,-1,-1,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,-1,-1,-1", + "endOffsets": "-1,-1,-1,759,986,1098,1040,1553,1662,1446,1371,1318,1499,818,873,1264,1153,1210,1609,926,-1,-1,-1" }, "to": { - "startLines": "13,14,15,16,17", + "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594", + "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,56", + "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1646" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "148,-1,-1,-1,-1,-1,-1,-1,-1,-1,147,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,145,143,144,-1,-1,-1,-1,-1,141,-1,-1,-1,142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,146,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,-1,-1,-1,-1,-1,4,-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,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", + "startOffsets": "9040,-1,-1,-1,-1,-1,-1,-1,-1,-1,9002,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8903,8792,8849,-1,-1,-1,-1,-1,8673,-1,-1,-1,8736,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8968,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "152,-1,-1,-1,-1,-1,-1,-1,-1,-1,147,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,145,143,144,-1,-1,-1,-1,-1,141,-1,-1,-1,142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,146,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,56,53,-1,-1,-1,-1,-1,62,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "9444,-1,-1,-1,-1,-1,-1,-1,-1,-1,9035,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8963,8844,8898,-1,-1,-1,-1,-1,8731,-1,-1,-1,8787,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8997,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "40,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "1913,2266,2362,2445,2541,2610,2653,2705,2757,2806,2869,2907,2954,3018,3076,3127,3211,3305,3413,3484,3568,3651,3717,3800,3902,3963,4025,4076,4154,4207,4267,4372,4431,4533,4598,4655,4709,4765,4816,4874,4932,4991,5054,5121,5190,5250,5306,5361,5432,5481,5539,5586,5645,5702,5773,5834,5891,5941,5993,6046,6096,6146,6206,6259,6325,6387,6450,6497,6552,6640,6698,6760,6812,6862,6907,6950,7010,7077,7132,7187,7240,7287,7340,7396,7444,7499,7552,7586,7670,7737,7801,7897,7971,8052,8141,8304,8448,8527,8602,8684,8743,8823,8903,8958,9080,9183,9224,9277,9334,9408,9473,9541,9627,9707,9776,9870,9929,9984,10046,10106,10216", + "endLines": "44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164", + "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,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": "2261,2357,2440,2536,2605,2648,2700,2752,2801,2864,2902,2949,3013,3071,3122,3206,3300,3408,3479,3563,3646,3712,3795,3897,3958,4020,4071,4149,4202,4262,4367,4426,4528,4593,4650,4704,4760,4811,4869,4927,4986,5049,5116,5185,5245,5301,5356,5427,5476,5534,5581,5640,5697,5768,5829,5886,5936,5988,6041,6091,6141,6201,6254,6320,6382,6445,6492,6547,6635,6693,6755,6807,6857,6902,6945,7005,7072,7127,7182,7235,7282,7335,7391,7439,7494,7547,7581,7665,7732,7796,7892,7966,8047,8136,8299,8443,8522,8597,8679,8738,8818,8898,8953,9075,9178,9219,9272,9329,9403,9468,9536,9622,9702,9771,9865,9924,9979,10041,10101,10211,10301" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-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", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "165,170,174,178,182,185,189,193,197,201,205,209", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "10306,10584,10792,11003,11168,11328,11511,11696,11881,12084,12290,12473", + "endLines": "169,173,177,181,184,188,192,196,200,204,208,212", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "10579,10787,10998,11163,11323,11506,11691,11876,12079,12285,12468,12669" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "35,36,37,38,39", "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", + "startOffsets": "1651,1703,1756,1809,1861", "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "endOffsets": "1698,1751,1804,1856,1908" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "map": [ { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.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" + "startLines": "-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", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594", + "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,56", + "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1646" } }, { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "49,55,66,61,15,20,25,31,37,10,43", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "1798,2043,2507,2299,421,628,837,1066,1314,215,1560", - "endLines": "52,58,69,63,18,23,28,34,40,13,46", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2001,2249,2710,2454,599,808,1017,1264,1515,393,1756" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8332,8543,8750,8910,9093,9278,9463,9666,9872,10055", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8327,8538,8745,8905,9088,9273,9458,9661,9867,10050,10251" + "startLines": "40,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "1913,2266,2362,2445,2541,2610,2653,2705,2757,2806,2869,2907,2954,3018,3076,3127,3211,3305,3413,3484,3568,3651,3717,3800,3902,3963,4025,4076,4154,4207,4267,4372,4431,4533,4598,4655,4709,4765,4816,4874,4932,4991,5054,5121,5190,5250,5306,5361,5432,5481,5539,5586,5645,5702,5773,5834,5891,5941,5993,6046,6096,6146,6206,6259,6325,6387,6450,6497,6552,6640,6698,6760,6812,6862,6907,6950,7010,7077,7132,7187,7240,7287,7340,7396,7444,7499,7552,7586,7670,7737,7801,7897,7971,8052,8141,8304,8448,8527,8602,8684,8743,8823,8903,8958,9080,9183,9224,9277,9334,9408,9473,9541,9627,9707,9776,9870,9929,9984,10046,10106,10216", + "endLines": "44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164", + "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,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": "2261,2357,2440,2536,2605,2648,2700,2752,2801,2864,2902,2949,3013,3071,3122,3206,3300,3408,3479,3563,3646,3712,3795,3897,3958,4020,4071,4149,4202,4262,4367,4426,4528,4593,4650,4704,4760,4811,4869,4927,4986,5049,5116,5185,5245,5301,5356,5427,5476,5534,5581,5640,5697,5768,5829,5886,5936,5988,6041,6091,6141,6201,6254,6320,6382,6445,6492,6547,6635,6693,6755,6807,6857,6902,6945,7005,7072,7127,7182,7235,7282,7335,7391,7439,7494,7547,7581,7665,7732,7796,7892,7966,8047,8136,8299,8443,8522,8597,8679,8738,8818,8898,8953,9075,9178,9219,9272,9329,9403,9468,9536,9622,9702,9771,9865,9924,9979,10041,10101,10211,10301" } }, { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "10,18", - "startColumns": "4,4", - "startOffsets": "237,524", - "endLines": "15,21", - "endColumns": "19,19", - "endOffsets": "492,639" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", @@ -78,20 +139,37 @@ } }, { - "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,76,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,4,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,3030,-1,-1,2507,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,82,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,12,-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,3432,-1,-1,2720,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "165,170,177,181,185,189,192,196,200,204,208,212,216", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "10306,10584,10991,11199,11410,11575,11735,11918,12103,12288,12491,12697,12880", + "endLines": "169,176,180,184,188,191,195,199,203,207,211,215,219", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "10579,10986,11194,11405,11570,11730,11913,12098,12283,12486,12692,12875,13076" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "16", - "startColumns": "4", - "startOffsets": "331", - "endColumns": "56", - "endOffsets": "383" + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" }, "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" + "startLines": "35,36,37,38,39", + "startColumns": "4,4,4,4,4", + "startOffsets": "1651,1703,1756,1809,1861", + "endColumns": "51,52,52,51,51", + "endOffsets": "1698,1751,1804,1856,1908" } } ] diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 2a106a9..fbfe904 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,382 +1,446 @@ [ { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_text_color_state_list.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\text_color_state_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_gesture_panel_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\gesture_panel_background.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_button_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\button_background.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_item.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_warning.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_warning.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw/introduction" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", - "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/preferences.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_gesture_verify.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_gesture_verify.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_audio.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_audio.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/searchable.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_layout_custom_toast.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\layout_custom_toast.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_lock_outline.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_lock_outline.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_activity_register.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_register.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_gesture_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\gesture_background.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_toast_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\toast_background.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_gesture_verify.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_gesture_verify.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edittext_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edittext_background.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_gesture_password.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_gesture_password.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_activity_login.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_login.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_gesture_button_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\gesture_button_background.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" } ] \ No newline at end of file diff --git a/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index 3020499..126fea6 100644 --- a/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -1,40 +1,32 @@ - - + android:versionName="0.1" > + + + - + - - - - - + - + + android:name="net.micode.notes.login.LoginActivity" + android:launchMode="singleTop" > @@ -42,14 +34,31 @@ + + + + + + - - @@ -58,7 +67,6 @@ - @@ -67,13 +75,12 @@ - - + @@ -85,28 +92,25 @@ android:authorities="micode_notes" android:multiprocess="true" /> - + - - - - + diff --git a/Src/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml b/Src/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml new file mode 100644 index 0000000..b003b3f --- /dev/null +++ b/Src/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Src/app/build/intermediates/packaged_manifests/debugAndroidTest/output-metadata.json b/Src/app/build/intermediates/packaged_manifests/debugAndroidTest/output-metadata.json new file mode 100644 index 0000000..890157a --- /dev/null +++ b/Src/app/build/intermediates/packaged_manifests/debugAndroidTest/output-metadata.json @@ -0,0 +1,18 @@ +{ + "version": 3, + "artifactType": { + "type": "PACKAGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "net.micode.notes.test", + "variantName": "debugAndroidTest", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "outputFile": "AndroidManifest.xml" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/Src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/Src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 6af9f95..8413ad5 100644 Binary files a/Src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/Src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/Src/app/build/intermediates/processed_res/debugAndroidTest/out/output-metadata.json b/Src/app/build/intermediates/processed_res/debugAndroidTest/out/output-metadata.json new file mode 100644 index 0000000..9932b33 --- /dev/null +++ b/Src/app/build/intermediates/processed_res/debugAndroidTest/out/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "PROCESSED_RES", + "kind": "Directory" + }, + "applicationId": "net.micode.notes.test", + "variantName": "debugAndroidTest", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 0, + "versionName": "", + "outputFile": "resources-debugAndroidTest.ap_" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/Src/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ b/Src/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ new file mode 100644 index 0000000..70d7578 Binary files /dev/null and b/Src/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_6.jar b/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_6.jar new file mode 100644 index 0000000..ccdc144 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_6.jar differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_9.jar b/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_9.jar new file mode 100644 index 0000000..e9014b2 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_9.jar differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/92922e5495b78ea82e09e2ccc5ac512f57b7e1742d4c266b4b51e58a4838f5c5_9.jar b/Src/app/build/intermediates/project_dex_archive/debug/out/92922e5495b78ea82e09e2ccc5ac512f57b7e1742d4c266b4b51e58a4838f5c5_9.jar deleted file mode 100644 index ed0cf9e..0000000 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/92922e5495b78ea82e09e2ccc5ac512f57b7e1742d4c266b4b51e58a4838f5c5_9.jar and /dev/null differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index 8df6234..19f6fa0 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex index 3e6ef4e..006b627 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 2b3310b..e83748e 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex index 00400e4..03d2859 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index c8ba276..b11b940 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index efade0e..88cf935 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/UserDao.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/UserDao.dex new file mode 100644 index 0000000..34694c4 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/UserDao.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index c87c426..9941c66 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 0cc357c..0b027db 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/LoginActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/LoginActivity.dex new file mode 100644 index 0000000..88f919f Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/LoginActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/RegisterActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/RegisterActivity.dex new file mode 100644 index 0000000..ab81682 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/RegisterActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index 022aa0e..80de515 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index e2eacc6..18a3072 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index d030ebc..8fcbd81 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 4e7bb85..d07bcfd 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index b5daad3..a0fa6bb 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex index 6981798..9bc0305 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex index 887e252..c3f789f 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex index 46b05cb..2b3bebd 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index d2e6a3c..3644f44 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 599a2d9..74df316 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index b43bda5..7c4e629 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 8f49436..4959c78 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 44fa7e6..5679e2a 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 518b973..e5915e1 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index 4a13d6c..be54e12 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$1.dex new file mode 100644 index 0000000..b999266 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$1.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$2.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$2.dex new file mode 100644 index 0000000..5174cb8 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$2.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$OnPatternListener.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$OnPatternListener.dex new file mode 100644 index 0000000..c811c5a Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$OnPatternListener.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$Point.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$Point.dex new file mode 100644 index 0000000..5ce9472 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$Point.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView.dex new file mode 100644 index 0000000..87881ab Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index b751af5..b9bf6b4 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 1c24fb1..96edb10 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index feca944..f030e80 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex index bac57cc..211d43f 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex new file mode 100644 index 0000000..8c431b5 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex new file mode 100644 index 0000000..ee28610 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex new file mode 100644 index 0000000..28d5626 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex new file mode 100644 index 0000000..0520730 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index a729733..64b6ac2 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 2f767ee..7e3b3bf 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index a5eb3f6..5a8944a 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity$1.dex new file mode 100644 index 0000000..8c2a4ab Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity$1.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity.dex new file mode 100644 index 0000000..84bd49f Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity$1.dex new file mode 100644 index 0000000..2d9fc8b Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity$1.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity.dex new file mode 100644 index 0000000..117512c Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 88d2d13..d552c13 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index b879b70..4f63ec9 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index dc98777..8b71b89 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index 3c450f8..00e6f52 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index 0d553f1..998c462 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 1d42e21..a6b81f9 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 55648d6..6ccffe9 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index e2d10f2..1aee92a 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 0adae7c..6dae3ce 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 66bf1d7..4e73351 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index 3e18dc1..deebdf0 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 5af6750..5cf8cb8 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index c5c21f3..1d61ede 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 247fa7f..4e5c399 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index 7554024..4aed14a 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index 01fd414..24181ac 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index fa02165..b968081 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 6aa2060..0cb4681 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index fc3d112..d3c00c4 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index cf7b6e2..893ec57 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 4177584..de7a914 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 523c713..03d8aeb 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index b474c57..4e262a7 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index 6f24cf3..e22593b 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debugAndroidTest/out/9beb0e8a81eac172d79c8e543de1eecc1ee027841815a239df7ee9481370a50b_2.jar b/Src/app/build/intermediates/project_dex_archive/debugAndroidTest/out/9beb0e8a81eac172d79c8e543de1eecc1ee027841815a239df7ee9481370a50b_2.jar new file mode 100644 index 0000000..d7cdf1c Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debugAndroidTest/out/9beb0e8a81eac172d79c8e543de1eecc1ee027841815a239df7ee9481370a50b_2.jar differ diff --git a/Src/app/build/intermediates/project_dex_archive/debugAndroidTest/out/net/micode/notes/test/BuildConfig.dex b/Src/app/build/intermediates/project_dex_archive/debugAndroidTest/out/net/micode/notes/test/BuildConfig.dex new file mode 100644 index 0000000..13be3cd Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debugAndroidTest/out/net/micode/notes/test/BuildConfig.dex differ diff --git a/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt b/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt index 2927cf5..a312398 100644 --- a/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -1,8 +1,31 @@ int array format_for_exported_note 0x7f010000 int array menu_share_ways 0x7f010001 -int color primary_text_dark 0x7f020000 -int color secondary_text_dark 0x7f020001 -int color user_query_highlight 0x7f020002 +int color background_color 0x7f020000 +int color button_color 0x7f020001 +int color button_text_color 0x7f020002 +int color gesture_background 0x7f02000b +int color gesture_button_background 0x7f02000c +int color gesture_button_ripple 0x7f02000d +int color gesture_button_text 0x7f02000e +int color gesture_error_color 0x7f02000f +int color gesture_hint_color 0x7f020010 +int color gesture_icon_color 0x7f020011 +int color gesture_line_error 0x7f020012 +int color gesture_line_normal 0x7f020013 +int color gesture_link_color 0x7f020014 +int color gesture_panel_background 0x7f020015 +int color gesture_panel_border 0x7f020016 +int color gesture_point_error 0x7f020017 +int color gesture_point_normal 0x7f020018 +int color gesture_point_selected 0x7f020019 +int color gesture_success_color 0x7f02001a +int color gesture_text_color 0x7f02001b +int color hint_color 0x7f020003 +int color primary_text_dark 0x7f020005 +int color secondary_text_dark 0x7f020007 +int color text_color 0x7f020008 +int color text_color_state_list 0x7f020009 +int color user_query_highlight 0x7f02000a int dimen text_font_size_large 0x7f030000 int dimen text_font_size_medium 0x7f030001 int dimen text_font_size_normal 0x7f030002 @@ -10,152 +33,184 @@ int dimen text_font_size_small 0x7f030003 int dimen text_font_size_super 0x7f030004 int drawable bg_btn_set_color 0x7f040000 int drawable bg_color_btn_mask 0x7f040001 -int drawable call_record 0x7f040002 -int drawable clock 0x7f040003 -int drawable delete 0x7f040004 -int drawable dropdown_icon 0x7f040005 -int drawable edit_blue 0x7f040006 -int drawable edit_green 0x7f040007 -int drawable edit_red 0x7f040008 -int drawable edit_title_blue 0x7f040009 -int drawable edit_title_green 0x7f04000a -int drawable edit_title_red 0x7f04000b -int drawable edit_title_white 0x7f04000c -int drawable edit_title_yellow 0x7f04000d -int drawable edit_white 0x7f04000e -int drawable edit_yellow 0x7f04000f -int drawable font_large 0x7f040010 -int drawable font_normal 0x7f040011 -int drawable font_size_selector_bg 0x7f040012 -int drawable font_small 0x7f040013 -int drawable font_super 0x7f040014 -int drawable icon_app 0x7f040015 -int drawable list_background 0x7f040016 -int drawable list_blue_down 0x7f040017 -int drawable list_blue_middle 0x7f040018 -int drawable list_blue_single 0x7f040019 -int drawable list_blue_up 0x7f04001a -int drawable list_folder 0x7f04001b -int drawable list_footer_bg 0x7f04001c -int drawable list_green_down 0x7f04001d -int drawable list_green_middle 0x7f04001e -int drawable list_green_single 0x7f04001f -int drawable list_green_up 0x7f040020 -int drawable list_red_down 0x7f040021 -int drawable list_red_middle 0x7f040022 -int drawable list_red_single 0x7f040023 -int drawable list_red_up 0x7f040024 -int drawable list_white_down 0x7f040025 -int drawable list_white_middle 0x7f040026 -int drawable list_white_single 0x7f040027 -int drawable list_white_up 0x7f040028 -int drawable list_yellow_down 0x7f040029 -int drawable list_yellow_middle 0x7f04002a -int drawable list_yellow_single 0x7f04002b -int drawable list_yellow_up 0x7f04002c -int drawable menu_delete 0x7f04002d -int drawable menu_move 0x7f04002e -int drawable new_note 0x7f04002f -int drawable new_note_normal 0x7f040030 -int drawable new_note_pressed 0x7f040031 -int drawable note_edit_color_selector_panel 0x7f040032 -int drawable notification 0x7f040033 -int drawable search_result 0x7f040034 -int drawable selected 0x7f040035 -int drawable title_alert 0x7f040036 -int drawable title_bar_bg 0x7f040037 -int drawable widget_2x_blue 0x7f040038 -int drawable widget_2x_green 0x7f040039 -int drawable widget_2x_red 0x7f04003a -int drawable widget_2x_white 0x7f04003b -int drawable widget_2x_yellow 0x7f04003c -int drawable widget_4x_blue 0x7f04003d -int drawable widget_4x_green 0x7f04003e -int drawable widget_4x_red 0x7f04003f -int drawable widget_4x_white 0x7f040040 -int drawable widget_4x_yellow 0x7f040041 +int drawable button_background 0x7f040002 +int drawable call_record 0x7f040003 +int drawable clock 0x7f040004 +int drawable delete 0x7f040005 +int drawable dropdown_icon 0x7f040006 +int drawable edit_blue 0x7f040007 +int drawable edit_green 0x7f040008 +int drawable edit_red 0x7f040009 +int drawable edit_title_blue 0x7f04000a +int drawable edit_title_green 0x7f04000b +int drawable edit_title_red 0x7f04000c +int drawable edit_title_white 0x7f04000d +int drawable edit_title_yellow 0x7f04000e +int drawable edit_white 0x7f04000f +int drawable edit_yellow 0x7f040010 +int drawable edittext_background 0x7f040011 +int drawable font_large 0x7f040012 +int drawable font_normal 0x7f040013 +int drawable font_size_selector_bg 0x7f040014 +int drawable font_small 0x7f040015 +int drawable font_super 0x7f040016 +int drawable gesture_background 0x7f040047 +int drawable gesture_button_background 0x7f040048 +int drawable gesture_panel_background 0x7f040049 +int drawable ic_audio 0x7f040017 +int drawable ic_lock_outline 0x7f04004a +int drawable ic_warning 0x7f040018 +int drawable icon_app 0x7f040019 +int drawable list_background 0x7f04001a +int drawable list_blue_down 0x7f04001b +int drawable list_blue_middle 0x7f04001c +int drawable list_blue_single 0x7f04001d +int drawable list_blue_up 0x7f04001e +int drawable list_folder 0x7f04001f +int drawable list_footer_bg 0x7f040020 +int drawable list_green_down 0x7f040021 +int drawable list_green_middle 0x7f040022 +int drawable list_green_single 0x7f040023 +int drawable list_green_up 0x7f040024 +int drawable list_red_down 0x7f040025 +int drawable list_red_middle 0x7f040026 +int drawable list_red_single 0x7f040027 +int drawable list_red_up 0x7f040028 +int drawable list_white_down 0x7f040029 +int drawable list_white_middle 0x7f04002a +int drawable list_white_single 0x7f04002b +int drawable list_white_up 0x7f04002c +int drawable list_yellow_down 0x7f04002d +int drawable list_yellow_middle 0x7f04002e +int drawable list_yellow_single 0x7f04002f +int drawable list_yellow_up 0x7f040030 +int drawable menu_delete 0x7f040031 +int drawable menu_move 0x7f040032 +int drawable new_note 0x7f040033 +int drawable new_note_normal 0x7f040034 +int drawable new_note_pressed 0x7f040035 +int drawable note_edit_color_selector_panel 0x7f040036 +int drawable notification 0x7f040037 +int drawable search_result 0x7f040038 +int drawable selected 0x7f040039 +int drawable title_alert 0x7f04003a +int drawable title_bar_bg 0x7f04003b +int drawable toast_background 0x7f04003c +int drawable widget_2x_blue 0x7f04003d +int drawable widget_2x_green 0x7f04003e +int drawable widget_2x_red 0x7f04003f +int drawable widget_2x_white 0x7f040040 +int drawable widget_2x_yellow 0x7f040041 +int drawable widget_4x_blue 0x7f040042 +int drawable widget_4x_green 0x7f040043 +int drawable widget_4x_red 0x7f040044 +int drawable widget_4x_white 0x7f040045 +int drawable widget_4x_yellow 0x7f040046 int id account_dialog_subtitle 0x7f050000 int id account_dialog_title 0x7f050001 int id action_select_all 0x7f050002 int id add_img_btn 0x7f050003 int id amPm 0x7f050004 -int id btn_new_note 0x7f050005 -int id btn_set_bg_color 0x7f050006 -int id cb_edit_item 0x7f050007 -int id date 0x7f050008 -int id delete 0x7f050009 -int id et_edit_text 0x7f05000a -int id et_foler_name 0x7f05000b -int id font_size_selector 0x7f05000c -int id hour 0x7f05000d -int id iv_alert_icon 0x7f05000e -int id iv_bg_blue 0x7f05000f -int id iv_bg_blue_select 0x7f050010 -int id iv_bg_green 0x7f050011 -int id iv_bg_green_select 0x7f050012 -int id iv_bg_red 0x7f050013 -int id iv_bg_red_select 0x7f050014 -int id iv_bg_white 0x7f050015 -int id iv_bg_white_select 0x7f050016 -int id iv_bg_yellow 0x7f050017 -int id iv_bg_yellow_select 0x7f050018 -int id iv_large_select 0x7f050019 -int id iv_medium_select 0x7f05001a -int id iv_small_select 0x7f05001b -int id iv_super_select 0x7f05001c -int id ll_font_large 0x7f05001d -int id ll_font_normal 0x7f05001e -int id ll_font_small 0x7f05001f -int id ll_font_super 0x7f050020 -int id menu_alert 0x7f050021 -int id menu_delete 0x7f050022 -int id menu_delete_remind 0x7f050023 -int id menu_export_text 0x7f050024 -int id menu_font_size 0x7f050025 -int id menu_list_mode 0x7f050026 -int id menu_new_folder 0x7f050027 -int id menu_new_note 0x7f050028 -int id menu_search 0x7f050029 -int id menu_send_to_desktop 0x7f05002a -int id menu_setting 0x7f05002b -int id menu_share 0x7f05002c -int id menu_sync 0x7f05002d -int id minute 0x7f05002e -int id move 0x7f05002f -int id navigation_bar 0x7f050030 -int id note_bg_color_selector 0x7f050031 -int id note_edit_list 0x7f050032 -int id note_edit_view 0x7f050033 -int id note_item 0x7f050034 -int id note_title 0x7f050035 -int id notes_list 0x7f050036 -int id prefenerece_sync_status_textview 0x7f050037 -int id preference_sync_button 0x7f050038 -int id selection_menu 0x7f050039 -int id sv_note_edit 0x7f05003a -int id tv_alert_date 0x7f05003b -int id tv_folder_name 0x7f05003c -int id tv_modified_date 0x7f05003d -int id tv_name 0x7f05003e -int id tv_time 0x7f05003f -int id tv_title 0x7f050040 -int id tv_title_bar 0x7f050041 -int id widget_bg_image 0x7f050042 -int id widget_text 0x7f050043 +int id btnBackToLogin 0x7f050005 +int id btnLogin 0x7f050006 +int id btnRegister 0x7f050007 +int id btn_confirm 0x7f050008 +int id btn_logout 0x7f050009 +int id btn_new_note 0x7f05000a +int id btn_set_bg_color 0x7f05000b +int id cb_edit_item 0x7f05000c +int id date 0x7f05000d +int id delete 0x7f05000e +int id etLoginPassword 0x7f05000f +int id etLoginUsername 0x7f050010 +int id etPassword 0x7f050011 +int id etUsername 0x7f050012 +int id et_edit_text 0x7f050013 +int id et_foler_name 0x7f050014 +int id font_size_selector 0x7f050015 +int id gesture_status 0x7f050017 +int id hour 0x7f050018 +int id imageView 0x7f050019 +int id iv_alert_icon 0x7f05001a +int id iv_bg_blue 0x7f05001b +int id iv_bg_blue_select 0x7f05001c +int id iv_bg_green 0x7f05001d +int id iv_bg_green_select 0x7f05001e +int id iv_bg_red 0x7f05001f +int id iv_bg_red_select 0x7f050020 +int id iv_bg_white 0x7f050021 +int id iv_bg_white_select 0x7f050022 +int id iv_bg_yellow 0x7f050023 +int id iv_bg_yellow_select 0x7f050024 +int id iv_large_select 0x7f050025 +int id iv_lock_icon 0x7f050055 +int id iv_medium_select 0x7f050026 +int id iv_small_select 0x7f050027 +int id iv_super_select 0x7f050028 +int id ll_font_large 0x7f050029 +int id ll_font_normal 0x7f05002a +int id ll_font_small 0x7f05002b +int id ll_font_super 0x7f05002c +int id lock_pattern_view 0x7f050054 +int id menu_alert 0x7f05002d +int id menu_delete 0x7f05002e +int id menu_delete_remind 0x7f05002f +int id menu_export_text 0x7f050030 +int id menu_font_size 0x7f050031 +int id menu_list_mode 0x7f050032 +int id menu_new_folder 0x7f050033 +int id menu_new_note 0x7f050034 +int id menu_search 0x7f050035 +int id menu_send_to_desktop 0x7f050036 +int id menu_set_gesture 0x7f050053 +int id menu_setting 0x7f050037 +int id menu_share 0x7f050038 +int id menu_sync 0x7f050039 +int id minute 0x7f05003a +int id move 0x7f05003b +int id navigation_bar 0x7f05003c +int id note_bg_color_selector 0x7f05003d +int id note_edit_list 0x7f05003e +int id note_edit_view 0x7f05003f +int id note_item 0x7f050040 +int id note_title 0x7f050041 +int id notes_list 0x7f050042 +int id prefenerece_sync_status_textview 0x7f050043 +int id preference_sync_button 0x7f050044 +int id record_audio_btn 0x7f050045 +int id selection_menu 0x7f050046 +int id speech_to_text_btn 0x7f050047 +int id sv_note_edit 0x7f050048 +int id textView 0x7f050049 +int id tv_alert_date 0x7f05004a +int id tv_folder_name 0x7f05004b +int id tv_forgot_pattern 0x7f050056 +int id tv_modified_date 0x7f05004c +int id tv_name 0x7f05004d +int id tv_time 0x7f05004e +int id tv_title 0x7f05004f +int id tv_title_bar 0x7f050050 +int id widget_bg_image 0x7f050051 +int id widget_text 0x7f050052 int layout account_dialog_title 0x7f060000 -int layout add_account_text 0x7f060001 -int layout datetime_picker 0x7f060002 -int layout dialog_edit_text 0x7f060003 -int layout folder_list_item 0x7f060004 -int layout note_edit 0x7f060005 -int layout note_edit_list_item 0x7f060006 -int layout note_item 0x7f060007 -int layout note_list 0x7f060008 -int layout note_list_dropdown_menu 0x7f060009 -int layout note_list_footer 0x7f06000a -int layout settings_header 0x7f06000b -int layout widget_2x 0x7f06000c -int layout widget_4x 0x7f06000d +int layout activity_login 0x7f060001 +int layout activity_register 0x7f060002 +int layout add_account_text 0x7f060003 +int layout datetime_picker 0x7f060004 +int layout dialog_edit_text 0x7f060005 +int layout folder_list_item 0x7f060006 +int layout layout_custom_toast 0x7f060007 +int layout note_edit 0x7f060008 +int layout note_edit_list_item 0x7f060009 +int layout note_gesture_password 0x7f06000a +int layout note_gesture_verify 0x7f060012 +int layout note_item 0x7f06000b +int layout note_list 0x7f06000c +int layout note_list_dropdown_menu 0x7f06000d +int layout note_list_footer 0x7f06000e +int layout settings_header 0x7f06000f +int layout widget_2x 0x7f060010 +int layout widget_4x 0x7f060011 int menu call_note_edit 0x7f070000 int menu call_record_folder 0x7f070001 int menu note_edit 0x7f070002 @@ -174,110 +229,130 @@ int string app_widget2x2 0x7f0a0005 int string app_widget4x4 0x7f0a0006 int string button_delete 0x7f0a0007 int string call_record_folder_name 0x7f0a0008 -int string datetime_dialog_cancel 0x7f0a0009 -int string datetime_dialog_ok 0x7f0a000a -int string delete_remind_time_message 0x7f0a000b -int string error_note_empty_for_clock 0x7f0a000c -int string error_note_empty_for_send_to_desktop 0x7f0a000d -int string error_note_not_exist 0x7f0a000e -int string error_sdcard_export 0x7f0a000f -int string error_sdcard_unmounted 0x7f0a0010 -int string error_sync_cancelled 0x7f0a0011 -int string error_sync_internal 0x7f0a0012 -int string error_sync_network 0x7f0a0013 -int string failed_sdcard_export 0x7f0a0014 -int string file_name_txt_format 0x7f0a0015 -int string file_path 0x7f0a0016 -int string folder_exist 0x7f0a0017 -int string format_date_ymd 0x7f0a0018 -int string format_datetime_mdhm 0x7f0a0019 -int string format_exported_file_location 0x7f0a001a -int string format_folder_files_count 0x7f0a001b -int string format_move_notes_to_folder 0x7f0a001c -int string hint_foler_name 0x7f0a001d -int string info_note_enter_desktop 0x7f0a001e -int string menu_alert 0x7f0a001f -int string menu_create_folder 0x7f0a0020 -int string menu_delete 0x7f0a0021 -int string menu_deselect_all 0x7f0a0022 -int string menu_export_text 0x7f0a0023 -int string menu_folder_change_name 0x7f0a0024 -int string menu_folder_delete 0x7f0a0025 -int string menu_folder_view 0x7f0a0026 -int string menu_font_large 0x7f0a0027 -int string menu_font_normal 0x7f0a0028 -int string menu_font_size 0x7f0a0029 -int string menu_font_small 0x7f0a002a -int string menu_font_super 0x7f0a002b -int string menu_list_mode 0x7f0a002c -int string menu_move 0x7f0a002d -int string menu_move_parent_folder 0x7f0a002e -int string menu_normal_mode 0x7f0a002f -int string menu_remove_remind 0x7f0a0030 -int string menu_search 0x7f0a0031 -int string menu_select_all 0x7f0a0032 -int string menu_select_none 0x7f0a0033 -int string menu_select_title 0x7f0a0034 -int string menu_send_to_desktop 0x7f0a0035 -int string menu_setting 0x7f0a0036 -int string menu_share 0x7f0a0037 -int string menu_sync 0x7f0a0038 -int string menu_sync_cancel 0x7f0a0039 -int string menu_title_select_folder 0x7f0a003a -int string note_alert_expired 0x7f0a003b -int string note_link_email 0x7f0a003c -int string note_link_other 0x7f0a003d -int string note_link_tel 0x7f0a003e -int string note_link_web 0x7f0a003f -int string notealert_enter 0x7f0a0040 -int string notealert_ok 0x7f0a0041 -int string notelist_menu_new 0x7f0a0042 -int string notelist_string_info 0x7f0a0043 -int string preferences_account_summary 0x7f0a0044 -int string preferences_account_title 0x7f0a0045 -int string preferences_add_account 0x7f0a0046 -int string preferences_bg_random_appear_title 0x7f0a0047 -int string preferences_button_sync_cancel 0x7f0a0048 -int string preferences_button_sync_immediately 0x7f0a0049 -int string preferences_dialog_change_account_title 0x7f0a004a -int string preferences_dialog_change_account_warn_msg 0x7f0a004b -int string preferences_dialog_select_account_tips 0x7f0a004c -int string preferences_dialog_select_account_title 0x7f0a004d -int string preferences_last_sync_time 0x7f0a004e -int string preferences_last_sync_time_format 0x7f0a004f -int string preferences_menu_cancel 0x7f0a0050 -int string preferences_menu_change_account 0x7f0a0051 -int string preferences_menu_remove_account 0x7f0a0052 -int string preferences_title 0x7f0a0053 -int string preferences_toast_cannot_change_account 0x7f0a0054 -int string preferences_toast_success_set_accout 0x7f0a0055 -int string search 0x7f0a0056 -int string search_hint 0x7f0a0057 -int string search_label 0x7f0a0058 -int string search_setting_description 0x7f0a0059 -int string set_remind_time_message 0x7f0a005a -int string success_sdcard_export 0x7f0a005b -int string success_sync_account 0x7f0a005c -int string sync_progress_init_list 0x7f0a005d -int string sync_progress_login 0x7f0a005e -int string sync_progress_syncing 0x7f0a005f -int string ticker_cancel 0x7f0a0060 -int string ticker_fail 0x7f0a0061 -int string ticker_success 0x7f0a0062 -int string ticker_syncing 0x7f0a0063 -int string widget_havenot_content 0x7f0a0064 -int string widget_under_visit_mode 0x7f0a0065 -int style HighlightTextAppearancePrimary 0x7f0b0000 -int style HighlightTextAppearanceSecondary 0x7f0b0001 -int style NoteActionBarStyle 0x7f0b0002 -int style NoteTheme 0x7f0b0003 -int style TextAppearanceLarge 0x7f0b0004 -int style TextAppearanceMedium 0x7f0b0005 -int style TextAppearanceNormal 0x7f0b0006 -int style TextAppearancePrimaryItem 0x7f0b0007 -int style TextAppearanceSecondaryItem 0x7f0b0008 -int style TextAppearanceSuper 0x7f0b0009 -int style TextAppearanceUnderMenuIcon 0x7f0b000a +int string cancel 0x7f0a0071 +int string confirm_gesture 0x7f0a0009 +int string confirm_gesture_pattern 0x7f0a000a +int string datetime_dialog_cancel 0x7f0a000b +int string datetime_dialog_ok 0x7f0a000c +int string delete_remind_time_message 0x7f0a000d +int string error_note_empty_for_clock 0x7f0a000e +int string error_note_empty_for_send_to_desktop 0x7f0a000f +int string error_note_not_exist 0x7f0a0010 +int string error_sdcard_export 0x7f0a0011 +int string error_sdcard_unmounted 0x7f0a0012 +int string error_sync_cancelled 0x7f0a0013 +int string error_sync_internal 0x7f0a0014 +int string error_sync_network 0x7f0a0015 +int string failed_sdcard_export 0x7f0a0016 +int string file_name_txt_format 0x7f0a0017 +int string file_path 0x7f0a0018 +int string folder_exist 0x7f0a0019 +int string format_date_ymd 0x7f0a001a +int string format_datetime_mdhm 0x7f0a001b +int string format_exported_file_location 0x7f0a001c +int string format_folder_files_count 0x7f0a001d +int string format_move_notes_to_folder 0x7f0a001e +int string gesture_forgot_message 0x7f0a0072 +int string gesture_forgot_pattern 0x7f0a0073 +int string gesture_forgot_title 0x7f0a0074 +int string gesture_instruction 0x7f0a001f +int string gesture_matched 0x7f0a0020 +int string gesture_not_matched 0x7f0a0021 +int string gesture_password_set 0x7f0a0022 +int string gesture_too_short 0x7f0a0023 +int string gesture_verify_error 0x7f0a0075 +int string gesture_verify_fail_max 0x7f0a006e +int string gesture_verify_fail_tries 0x7f0a006f +int string gesture_verify_hint 0x7f0a0070 +int string gesture_verify_success 0x7f0a0076 +int string hint_foler_name 0x7f0a0024 +int string info_note_enter_desktop 0x7f0a0025 +int string menu_alert 0x7f0a0026 +int string menu_create_folder 0x7f0a0027 +int string menu_delete 0x7f0a0028 +int string menu_deselect_all 0x7f0a0029 +int string menu_export_text 0x7f0a002a +int string menu_folder_change_name 0x7f0a002b +int string menu_folder_delete 0x7f0a002c +int string menu_folder_view 0x7f0a002d +int string menu_font_large 0x7f0a002e +int string menu_font_normal 0x7f0a002f +int string menu_font_size 0x7f0a0030 +int string menu_font_small 0x7f0a0031 +int string menu_font_super 0x7f0a0032 +int string menu_list_mode 0x7f0a0033 +int string menu_move 0x7f0a0034 +int string menu_move_parent_folder 0x7f0a0035 +int string menu_normal_mode 0x7f0a0036 +int string menu_remove_remind 0x7f0a0037 +int string menu_search 0x7f0a0038 +int string menu_select_all 0x7f0a0039 +int string menu_select_none 0x7f0a003a +int string menu_select_title 0x7f0a003b +int string menu_send_to_desktop 0x7f0a003c +int string menu_set_gesture 0x7f0a003d +int string menu_setting 0x7f0a003e +int string menu_share 0x7f0a003f +int string menu_sync 0x7f0a0040 +int string menu_sync_cancel 0x7f0a0041 +int string menu_title_select_folder 0x7f0a0042 +int string note_alert_expired 0x7f0a0043 +int string note_link_email 0x7f0a0044 +int string note_link_other 0x7f0a0045 +int string note_link_tel 0x7f0a0046 +int string note_link_web 0x7f0a0047 +int string notealert_enter 0x7f0a0048 +int string notealert_ok 0x7f0a0049 +int string notelist_menu_new 0x7f0a004a +int string notelist_string_info 0x7f0a004b +int string ok 0x7f0a0077 +int string preferences_account_summary 0x7f0a004c +int string preferences_account_title 0x7f0a004d +int string preferences_add_account 0x7f0a004e +int string preferences_bg_random_appear_title 0x7f0a004f +int string preferences_button_sync_cancel 0x7f0a0050 +int string preferences_button_sync_immediately 0x7f0a0051 +int string preferences_dialog_change_account_title 0x7f0a0052 +int string preferences_dialog_change_account_warn_msg 0x7f0a0053 +int string preferences_dialog_select_account_tips 0x7f0a0054 +int string preferences_dialog_select_account_title 0x7f0a0055 +int string preferences_last_sync_time 0x7f0a0056 +int string preferences_last_sync_time_format 0x7f0a0057 +int string preferences_menu_cancel 0x7f0a0058 +int string preferences_menu_change_account 0x7f0a0059 +int string preferences_menu_remove_account 0x7f0a005a +int string preferences_title 0x7f0a005b +int string preferences_toast_cannot_change_account 0x7f0a005c +int string preferences_toast_success_set_accout 0x7f0a005d +int string search 0x7f0a005e +int string search_hint 0x7f0a005f +int string search_label 0x7f0a0060 +int string search_setting_description 0x7f0a0061 +int string set_remind_time_message 0x7f0a0062 +int string success_sdcard_export 0x7f0a0063 +int string success_sync_account 0x7f0a0064 +int string sync_progress_init_list 0x7f0a0065 +int string sync_progress_login 0x7f0a0066 +int string sync_progress_syncing 0x7f0a0067 +int string ticker_cancel 0x7f0a0068 +int string ticker_fail 0x7f0a0069 +int string ticker_success 0x7f0a006a +int string ticker_syncing 0x7f0a006b +int string widget_havenot_content 0x7f0a006c +int string widget_under_visit_mode 0x7f0a006d +int style CustomEditTextStyle 0x7f0b0000 +int style GestureVerifyTheme 0x7f0b000c +int style HighlightTextAppearancePrimary 0x7f0b0001 +int style HighlightTextAppearanceSecondary 0x7f0b0002 +int style NoteActionBarStyle 0x7f0b0003 +int style NoteTheme 0x7f0b0004 +int style TextAppearanceLarge 0x7f0b0005 +int style TextAppearanceMedium 0x7f0b0006 +int style TextAppearanceNormal 0x7f0b0007 +int style TextAppearancePrimaryItem 0x7f0b0008 +int style TextAppearanceSecondaryItem 0x7f0b0009 +int style TextAppearanceSuper 0x7f0b000a +int style TextAppearanceUnderMenuIcon 0x7f0b000b int xml preferences 0x7f0c0000 int xml searchable 0x7f0c0001 int xml widget_2x_info 0x7f0c0002 diff --git a/Src/app/build/intermediates/runtime_symbol_list/debugAndroidTest/R.txt b/Src/app/build/intermediates/runtime_symbol_list/debugAndroidTest/R.txt new file mode 100644 index 0000000..e69de29 diff --git a/Src/app/build/intermediates/signing_config_versions/debugAndroidTest/signing-config-versions.json b/Src/app/build/intermediates/signing_config_versions/debugAndroidTest/signing-config-versions.json new file mode 100644 index 0000000..bb4deaa --- /dev/null +++ b/Src/app/build/intermediates/signing_config_versions/debugAndroidTest/signing-config-versions.json @@ -0,0 +1 @@ +{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt index dff1812..446cb75 100644 --- a/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\github\XiaoMiNote\Src\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\github\XiaoMiNote\Src\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\github\XiaoMiNote\Src\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\github\XiaoMiNote\Src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\github\XiaoMiNote\Src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\github\XiaoMiNote\Src\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\github\XiaoMiNote\Src\app\src\debug\res -net.micode.notes.app-main-7 D:\github\XiaoMiNote\Src\app\src\main\res +net.micode.notes.app-pngs-0 D:\gitnote\notes\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\gitnote\notes\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\gitnote\notes\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\gitnote\notes\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\gitnote\notes\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\gitnote\notes\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\gitnote\notes\app\src\debug\res +net.micode.notes.app-main-7 D:\gitnote\notes\app\src\main\res diff --git a/Src/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt b/Src/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt new file mode 100644 index 0000000..c7e7b60 --- /dev/null +++ b/Src/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt @@ -0,0 +1,5 @@ +net.micode.notes.test.app-androidTest-0 D:\gitnote\notes\app\build\generated\res\resValues\androidTest\debug +net.micode.notes.test.app-androidTest-1 D:\gitnote\notes\app\build\generated\res\rs\androidTest\debug +net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\gitnote\notes\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir +net.micode.notes.test.app-mergeDebugAndroidTestResources-3 D:\gitnote\notes\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir +net.micode.notes.test.app-merged_res-4 D:\gitnote\notes\app\build\intermediates\merged_res\debugAndroidTest diff --git a/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 83040b8..81c2b47 100644 --- a/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,284 +1,362 @@ -net.micode.notes:xml/widget_4x_info = 0x7f0c0003 +net.micode.notes:string/gesture_verify_success = 0x7f0a0076 +net.micode.notes:color/gesture_link_color = 0x7f020014 +net.micode.notes:layout/layout_custom_toast = 0x7f060007 +net.micode.notes:color/gesture_button_ripple = 0x7f02000d +net.micode.notes:string/gesture_verify_error = 0x7f0a0075 +net.micode.notes:string/gesture_verify_fail_tries = 0x7f0a006f +net.micode.notes:id/tv_forgot_pattern = 0x7f050056 +net.micode.notes:string/format_folder_files_count = 0x7f0a001d +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0055 +net.micode.notes:string/ticker_success = 0x7f0a006a +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a005a +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0001 +net.micode.notes:string/menu_sync = 0x7f0a0040 +net.micode.notes:color/gesture_background = 0x7f02000b +net.micode.notes:color/gesture_button_text = 0x7f02000e +net.micode.notes:color/gesture_hint_color = 0x7f020010 +net.micode.notes:color/gesture_panel_border = 0x7f020016 +net.micode.notes:string/success_sdcard_export = 0x7f0a0063 +net.micode.notes:string/notelist_string_info = 0x7f0a004b +net.micode.notes:string/menu_move_parent_folder = 0x7f0a0035 +net.micode.notes:string/confirm_gesture = 0x7f0a0009 net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 -net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 -net.micode.notes:string/ticker_syncing = 0x7f0a0063 -net.micode.notes:string/ticker_success = 0x7f0a0062 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 -net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 -net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 -net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/notelist_string_info = 0x7f0a0043 -net.micode.notes:string/notelist_menu_new = 0x7f0a0042 -net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/notealert_enter = 0x7f0a0040 -net.micode.notes:string/note_link_web = 0x7f0a003f -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:string/note_link_other = 0x7f0a003d -net.micode.notes:string/note_link_email = 0x7f0a003c -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:string/menu_select_none = 0x7f0a0033 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003a -net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/menu_search = 0x7f0a0031 -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f -net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:string/menu_move = 0x7f0a002d -net.micode.notes:string/menu_list_mode = 0x7f0a002c -net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:string/menu_deselect_all = 0x7f0a0022 -net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/folder_exist = 0x7f0a0017 -net.micode.notes:string/hint_foler_name = 0x7f0a001d -net.micode.notes:string/format_date_ymd = 0x7f0a0018 -net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/set_remind_time_message = 0x7f0a005a -net.micode.notes:string/error_sync_network = 0x7f0a0013 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:drawable/list_green_up = 0x7f040020 -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/new_note_normal = 0x7f040030 -net.micode.notes:string/button_delete = 0x7f0a0007 -net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a -net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:string/delete_remind_time_message = 0x7f0a000b -net.micode.notes:dimen/text_font_size_super = 0x7f030004 -net.micode.notes:drawable/selected = 0x7f040035 -net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:id/iv_bg_white = 0x7f050021 +net.micode.notes:drawable/gesture_background = 0x7f040047 +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000c +net.micode.notes:string/sync_progress_init_list = 0x7f0a0065 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0058 +net.micode.notes:color/gesture_point_error = 0x7f020017 +net.micode.notes:string/notelist_menu_new = 0x7f0a004a +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0009 +net.micode.notes:drawable/ic_lock_outline = 0x7f04004a +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001e +net.micode.notes:string/menu_remove_remind = 0x7f0a0037 +net.micode.notes:string/gesture_forgot_pattern = 0x7f0a0073 +net.micode.notes:layout/note_list = 0x7f06000c +net.micode.notes:color/gesture_error_color = 0x7f02000f +net.micode.notes:drawable/gesture_panel_background = 0x7f040049 +net.micode.notes:string/ticker_syncing = 0x7f0a006b +net.micode.notes:style/GestureVerifyTheme = 0x7f0b000c +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000f +net.micode.notes:id/lock_pattern_view = 0x7f050054 +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0053 +net.micode.notes:color/gesture_button_background = 0x7f02000c +net.micode.notes:string/preferences_last_sync_time = 0x7f0a0056 +net.micode.notes:color/gesture_text_color = 0x7f02001b +net.micode.notes:color/gesture_point_selected = 0x7f020019 +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000b +net.micode.notes:string/search_label = 0x7f0a0060 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0006 +net.micode.notes:string/menu_select_none = 0x7f0a003a +net.micode.notes:id/menu_send_to_desktop = 0x7f050036 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a006d +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a005d +net.micode.notes:style/NoteActionBarStyle = 0x7f0b0003 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0059 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a005c +net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 +net.micode.notes:string/menu_normal_mode = 0x7f0a0036 +net.micode.notes:drawable/title_alert = 0x7f04003a +net.micode.notes:id/note_title = 0x7f050041 +net.micode.notes:string/menu_search = 0x7f0a0038 +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0007 +net.micode.notes:string/preferences_title = 0x7f0a005b +net.micode.notes:string/delete_remind_time_message = 0x7f0a000d +net.micode.notes:string/widget_havenot_content = 0x7f0a006c +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0051 +net.micode.notes:id/notes_list = 0x7f050042 +net.micode.notes:layout/note_edit = 0x7f060008 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0050 +net.micode.notes:string/preferences_account_summary = 0x7f0a004c +net.micode.notes:color/gesture_line_error = 0x7f020012 net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:string/menu_share = 0x7f0a003f +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0002 +net.micode.notes:string/ticker_cancel = 0x7f0a0068 +net.micode.notes:string/ok = 0x7f0a0077 +net.micode.notes:string/notealert_ok = 0x7f0a0049 +net.micode.notes:string/app_widget4x4 = 0x7f0a0006 +net.micode.notes:string/note_link_web = 0x7f0a0047 +net.micode.notes:id/tv_time = 0x7f05004e +net.micode.notes:drawable/widget_2x_blue = 0x7f04003d +net.micode.notes:string/sync_progress_syncing = 0x7f0a0067 +net.micode.notes:id/btn_confirm = 0x7f050008 +net.micode.notes:string/menu_deselect_all = 0x7f0a0029 +net.micode.notes:string/note_link_email = 0x7f0a0044 +net.micode.notes:string/menu_export_text = 0x7f0a002a +net.micode.notes:string/note_alert_expired = 0x7f0a0043 +net.micode.notes:string/note_link_other = 0x7f0a0045 +net.micode.notes:string/file_path = 0x7f0a0018 +net.micode.notes:layout/activity_login = 0x7f060001 +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 +net.micode.notes:string/menu_set_gesture = 0x7f0a003d +net.micode.notes:id/menu_search = 0x7f050035 +net.micode.notes:color/gesture_icon_color = 0x7f020011 +net.micode.notes:id/tv_name = 0x7f05004d +net.micode.notes:string/menu_move = 0x7f0a0034 net.micode.notes:menu/note_edit = 0x7f070002 -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 -net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:id/move = 0x7f05002f -net.micode.notes:id/iv_bg_yellow_select = 0x7f050018 -net.micode.notes:menu/call_note_edit = 0x7f070000 -net.micode.notes:drawable/new_note_pressed = 0x7f040031 -net.micode.notes:id/iv_bg_blue = 0x7f05000f -net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:drawable/list_white_single = 0x7f040027 -net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:string/menu_list_mode = 0x7f0a0033 +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000e +net.micode.notes:id/iv_bg_blue_select = 0x7f05001c +net.micode.notes:id/menu_share = 0x7f050038 +net.micode.notes:string/menu_create_folder = 0x7f0a0027 +net.micode.notes:string/format_datetime_mdhm = 0x7f0a001b +net.micode.notes:string/format_date_ymd = 0x7f0a001a +net.micode.notes:string/notealert_enter = 0x7f0a0048 +net.micode.notes:drawable/new_note = 0x7f040033 +net.micode.notes:id/sv_note_edit = 0x7f050048 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:id/btn_new_note = 0x7f050005 -net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:id/widget_text = 0x7f050043 -net.micode.notes:id/tv_title_bar = 0x7f050041 -net.micode.notes:drawable/widget_2x_blue = 0x7f040038 -net.micode.notes:id/tv_time = 0x7f05003f -net.micode.notes:id/tv_name = 0x7f05003e -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:id/sv_note_edit = 0x7f05003a -net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:id/preference_sync_button = 0x7f050038 -net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/notes_list = 0x7f050036 -net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:id/note_title = 0x7f050035 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f -net.micode.notes:id/note_edit_view = 0x7f050033 -net.micode.notes:id/navigation_bar = 0x7f050030 -net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:id/minute = 0x7f05002e -net.micode.notes:drawable/font_super = 0x7f040014 -net.micode.notes:id/menu_sync = 0x7f05002d -net.micode.notes:id/menu_share = 0x7f05002c -net.micode.notes:id/menu_setting = 0x7f05002b -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -net.micode.notes:id/menu_send_to_desktop = 0x7f05002a -net.micode.notes:id/menu_search = 0x7f050029 -net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:id/menu_new_note = 0x7f050028 -net.micode.notes:string/error_note_not_exist = 0x7f0a000e -net.micode.notes:id/menu_new_folder = 0x7f050027 -net.micode.notes:id/menu_list_mode = 0x7f050026 -net.micode.notes:id/iv_medium_select = 0x7f05001a -net.micode.notes:id/menu_export_text = 0x7f050024 -net.micode.notes:string/menu_folder_view = 0x7f0a0026 -net.micode.notes:id/menu_delete = 0x7f050022 -net.micode.notes:string/ticker_fail = 0x7f0a0061 -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050037 -net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:string/menu_alert = 0x7f0a001f -net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:id/menu_alert = 0x7f050021 -net.micode.notes:string/success_sync_account = 0x7f0a005c -net.micode.notes:id/ll_font_super = 0x7f050020 -net.micode.notes:id/ll_font_small = 0x7f05001f +net.micode.notes:layout/datetime_picker = 0x7f060004 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:string/menu_font_small = 0x7f0a0031 +net.micode.notes:string/gesture_not_matched = 0x7f0a0021 +net.micode.notes:string/failed_sdcard_export = 0x7f0a0016 +net.micode.notes:string/menu_folder_change_name = 0x7f0a002b +net.micode.notes:string/set_remind_time_message = 0x7f0a0062 +net.micode.notes:string/error_sync_network = 0x7f0a0015 +net.micode.notes:string/error_note_not_exist = 0x7f0a0010 +net.micode.notes:id/menu_new_folder = 0x7f050033 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0012 +net.micode.notes:id/speech_to_text_btn = 0x7f050047 +net.micode.notes:string/app_widget2x2 = 0x7f0a0005 +net.micode.notes:string/menu_select_title = 0x7f0a003b +net.micode.notes:string/app_name = 0x7f0a0004 +net.micode.notes:string/alert_title_delete = 0x7f0a0003 +net.micode.notes:raw/introduction = 0x7f090000 +net.micode.notes:string/menu_font_normal = 0x7f0a002f +net.micode.notes:string/format_exported_file_location = 0x7f0a001c +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0005 +net.micode.notes:drawable/new_note_pressed = 0x7f040035 +net.micode.notes:id/iv_bg_blue = 0x7f05001b +net.micode.notes:layout/settings_header = 0x7f06000f +net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b000a +net.micode.notes:color/secondary_text_dark = 0x7f020007 +net.micode.notes:id/move = 0x7f05003b +net.micode.notes:id/iv_bg_yellow_select = 0x7f050024 +net.micode.notes:string/note_link_tel = 0x7f0a0046 +net.micode.notes:id/widget_text = 0x7f050052 +net.micode.notes:layout/note_list_footer = 0x7f06000e +net.micode.notes:id/btn_new_note = 0x7f05000a +net.micode.notes:string/menu_font_super = 0x7f0a0032 +net.micode.notes:id/textView = 0x7f050049 +net.micode.notes:id/preference_sync_button = 0x7f050044 +net.micode.notes:string/error_sdcard_export = 0x7f0a0011 +net.micode.notes:drawable/font_normal = 0x7f040013 +net.micode.notes:id/minute = 0x7f05003a +net.micode.notes:drawable/font_super = 0x7f040016 +net.micode.notes:id/menu_sync = 0x7f050039 +net.micode.notes:id/menu_setting = 0x7f050037 +net.micode.notes:string/gesture_forgot_message = 0x7f0a0072 +net.micode.notes:id/menu_new_note = 0x7f050034 +net.micode.notes:drawable/list_green_down = 0x7f040021 +net.micode.notes:id/menu_list_mode = 0x7f050032 +net.micode.notes:id/iv_medium_select = 0x7f050026 +net.micode.notes:id/menu_export_text = 0x7f050030 +net.micode.notes:string/menu_folder_view = 0x7f0a002d +net.micode.notes:id/menu_delete = 0x7f05002e +net.micode.notes:layout/activity_register = 0x7f060002 +net.micode.notes:drawable/edit_blue = 0x7f040007 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050043 +net.micode.notes:string/file_name_txt_format = 0x7f0a0017 +net.micode.notes:string/ticker_fail = 0x7f0a0069 +net.micode.notes:id/gesture_status = 0x7f050017 +net.micode.notes:id/menu_alert = 0x7f05002d +net.micode.notes:string/menu_font_size = 0x7f0a0030 +net.micode.notes:drawable/edit_title_yellow = 0x7f04000e +net.micode.notes:string/menu_alert = 0x7f0a0026 +net.micode.notes:id/record_audio_btn = 0x7f050045 +net.micode.notes:id/date = 0x7f05000d +net.micode.notes:id/ll_font_super = 0x7f05002c +net.micode.notes:string/success_sync_account = 0x7f0a0064 +net.micode.notes:id/etLoginPassword = 0x7f05000f +net.micode.notes:id/ll_font_normal = 0x7f05002a net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:id/ll_font_normal = 0x7f05001e -net.micode.notes:id/ll_font_large = 0x7f05001d -net.micode.notes:id/note_bg_color_selector = 0x7f050031 -net.micode.notes:drawable/search_result = 0x7f040034 -net.micode.notes:id/iv_super_select = 0x7f05001c -net.micode.notes:id/iv_bg_yellow = 0x7f050017 -net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 -net.micode.notes:id/iv_bg_white_select = 0x7f050016 -net.micode.notes:id/iv_bg_white = 0x7f050015 -net.micode.notes:id/tv_alert_date = 0x7f05003b -net.micode.notes:dimen/text_font_size_large = 0x7f030000 -net.micode.notes:drawable/notification = 0x7f040033 -net.micode.notes:id/iv_bg_red = 0x7f050013 -net.micode.notes:string/menu_font_large = 0x7f0a0027 -net.micode.notes:drawable/widget_4x_blue = 0x7f04003d -net.micode.notes:id/iv_large_select = 0x7f050019 -net.micode.notes:id/widget_bg_image = 0x7f050042 -net.micode.notes:id/iv_bg_green_select = 0x7f050012 -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a -net.micode.notes:drawable/menu_move = 0x7f04002e -net.micode.notes:drawable/widget_4x_white = 0x7f040040 -net.micode.notes:id/iv_bg_blue_select = 0x7f050010 -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c -net.micode.notes:id/font_size_selector = 0x7f05000c -net.micode.notes:id/et_edit_text = 0x7f05000a -net.micode.notes:id/et_foler_name = 0x7f05000b -net.micode.notes:drawable/edit_green = 0x7f040007 -net.micode.notes:layout/widget_4x = 0x7f06000d -net.micode.notes:string/search = 0x7f0a0056 -net.micode.notes:id/cb_edit_item = 0x7f050007 -net.micode.notes:id/btn_set_bg_color = 0x7f050006 +net.micode.notes:id/ll_font_large = 0x7f050029 +net.micode.notes:id/note_bg_color_selector = 0x7f05003d +net.micode.notes:id/iv_super_select = 0x7f050028 +net.micode.notes:drawable/search_result = 0x7f040038 +net.micode.notes:id/iv_bg_yellow = 0x7f050023 +net.micode.notes:string/error_sync_cancelled = 0x7f0a0013 +net.micode.notes:id/iv_bg_white_select = 0x7f050022 +net.micode.notes:drawable/widget_4x_blue = 0x7f040042 +net.micode.notes:id/iv_large_select = 0x7f050025 +net.micode.notes:string/menu_font_large = 0x7f0a002e +net.micode.notes:id/iv_bg_green_select = 0x7f05001e +net.micode.notes:id/widget_bg_image = 0x7f050051 +net.micode.notes:color/primary_color = 0x7f020004 +net.micode.notes:id/amPm = 0x7f050004 +net.micode.notes:id/iv_bg_green = 0x7f05001d +net.micode.notes:menu/note_list_options = 0x7f070005 +net.micode.notes:id/iv_small_select = 0x7f050027 +net.micode.notes:id/hour = 0x7f050018 +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040036 +net.micode.notes:style/NoteTheme = 0x7f0b0004 +net.micode.notes:id/font_size_selector = 0x7f050015 +net.micode.notes:color/secondary_color = 0x7f020006 +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0054 +net.micode.notes:layout/note_gesture_verify = 0x7f060012 +net.micode.notes:id/et_edit_text = 0x7f050013 +net.micode.notes:layout/note_item = 0x7f06000b +net.micode.notes:drawable/list_white_single = 0x7f04002b +net.micode.notes:id/etUsername = 0x7f050012 +net.micode.notes:string/hint_foler_name = 0x7f0a0024 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0008 +net.micode.notes:string/folder_exist = 0x7f0a0019 +net.micode.notes:id/ll_font_small = 0x7f05002b +net.micode.notes:id/etPassword = 0x7f050011 +net.micode.notes:id/etLoginUsername = 0x7f050010 +net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000b +net.micode.notes:id/delete = 0x7f05000e +net.micode.notes:id/btn_set_bg_color = 0x7f05000b +net.micode.notes:color/button_text_color = 0x7f020002 +net.micode.notes:id/imageView = 0x7f050019 +net.micode.notes:drawable/button_background = 0x7f040002 +net.micode.notes:id/btn_logout = 0x7f050009 +net.micode.notes:id/btnRegister = 0x7f050007 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a0052 +net.micode.notes:drawable/menu_move = 0x7f040032 +net.micode.notes:id/btnLogin = 0x7f050006 +net.micode.notes:drawable/widget_4x_white = 0x7f040045 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/iv_bg_green = 0x7f050011 -net.micode.notes:id/amPm = 0x7f050004 -net.micode.notes:drawable/widget_4x_green = 0x7f04003e -net.micode.notes:style/NoteTheme = 0x7f0b0003 -net.micode.notes:id/hour = 0x7f05000d -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 -net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c -net.micode.notes:drawable/widget_2x_red = 0x7f04003a -net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:id/delete = 0x7f050009 -net.micode.notes:drawable/widget_2x_green = 0x7f040039 -net.micode.notes:drawable/title_bar_bg = 0x7f040037 -net.micode.notes:drawable/menu_delete = 0x7f04002d -net.micode.notes:string/error_sync_internal = 0x7f0a0012 -net.micode.notes:drawable/list_green_single = 0x7f04001f -net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:id/tv_modified_date = 0x7f05003d -net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:id/iv_small_select = 0x7f05001b -net.micode.notes:menu/note_list_options = 0x7f070005 +net.micode.notes:string/gesture_matched = 0x7f0a0020 +net.micode.notes:drawable/widget_4x_green = 0x7f040043 +net.micode.notes:dimen/text_font_size_large = 0x7f030000 +net.micode.notes:id/tv_alert_date = 0x7f05004a +net.micode.notes:drawable/widget_2x_red = 0x7f04003f +net.micode.notes:color/gesture_point_normal = 0x7f020018 +net.micode.notes:drawable/widget_2x_green = 0x7f04003e +net.micode.notes:drawable/title_bar_bg = 0x7f04003b +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:dimen/text_font_size_super = 0x7f030004 +net.micode.notes:drawable/selected = 0x7f040039 +net.micode.notes:string/gesture_verify_fail_max = 0x7f0a006e +net.micode.notes:id/iv_bg_red = 0x7f05001f +net.micode.notes:drawable/notification = 0x7f040037 +net.micode.notes:id/tv_modified_date = 0x7f05004c +net.micode.notes:drawable/ic_warning = 0x7f040018 +net.micode.notes:drawable/list_blue_middle = 0x7f04001c +net.micode.notes:id/menu_delete_remind = 0x7f05002f +net.micode.notes:drawable/list_red_down = 0x7f040025 +net.micode.notes:drawable/list_red_middle = 0x7f040026 +net.micode.notes:drawable/gesture_button_background = 0x7f040048 +net.micode.notes:id/menu_set_gesture = 0x7f050053 +net.micode.notes:string/menu_title_select_folder = 0x7f0a0042 +net.micode.notes:string/menu_select_all = 0x7f0a0039 +net.micode.notes:drawable/toast_background = 0x7f04003c net.micode.notes:xml/searchable = 0x7f0c0001 -net.micode.notes:string/menu_folder_delete = 0x7f0a0025 -net.micode.notes:drawable/dropdown_icon = 0x7f040005 -net.micode.notes:id/date = 0x7f050008 -net.micode.notes:drawable/list_yellow_single = 0x7f04002b -net.micode.notes:drawable/list_red_up = 0x7f040024 -net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 -net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:id/tv_folder_name = 0x7f05003c -net.micode.notes:drawable/list_yellow_down = 0x7f040029 -net.micode.notes:string/format_folder_files_count = 0x7f0a001b -net.micode.notes:drawable/clock = 0x7f040003 -net.micode.notes:drawable/list_white_up = 0x7f040028 -net.micode.notes:drawable/edit_title_blue = 0x7f040009 -net.micode.notes:drawable/edit_red = 0x7f040008 -net.micode.notes:id/iv_alert_icon = 0x7f05000e -net.micode.notes:layout/dialog_edit_text = 0x7f060003 -net.micode.notes:string/preferences_account_title = 0x7f0a0045 -net.micode.notes:drawable/edit_white = 0x7f04000e -net.micode.notes:drawable/list_white_middle = 0x7f040026 -net.micode.notes:color/user_query_highlight = 0x7f020002 -net.micode.notes:drawable/list_white_down = 0x7f040025 -net.micode.notes:string/preferences_add_account = 0x7f0a0046 -net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 -net.micode.notes:layout/widget_2x = 0x7f06000c -net.micode.notes:drawable/list_footer_bg = 0x7f04001c -net.micode.notes:string/alert_title_delete = 0x7f0a0003 -net.micode.notes:drawable/edit_title_green = 0x7f04000a -net.micode.notes:drawable/icon_app = 0x7f040015 -net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 -net.micode.notes:drawable/list_red_single = 0x7f040023 -net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 -net.micode.notes:drawable/widget_4x_red = 0x7f04003f -net.micode.notes:id/menu_delete_remind = 0x7f050023 -net.micode.notes:drawable/list_red_down = 0x7f040021 -net.micode.notes:drawable/list_red_middle = 0x7f040022 -net.micode.notes:id/iv_bg_red_select = 0x7f050014 -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d -net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 -net.micode.notes:drawable/list_blue_down = 0x7f040017 +net.micode.notes:string/menu_folder_delete = 0x7f0a002c +net.micode.notes:string/gesture_too_short = 0x7f0a0023 +net.micode.notes:drawable/dropdown_icon = 0x7f040006 +net.micode.notes:string/button_delete = 0x7f0a0007 +net.micode.notes:drawable/new_note_normal = 0x7f040034 +net.micode.notes:drawable/list_yellow_single = 0x7f04002f +net.micode.notes:id/tv_folder_name = 0x7f05004b +net.micode.notes:drawable/list_yellow_down = 0x7f04002d +net.micode.notes:color/gesture_line_normal = 0x7f020013 +net.micode.notes:layout/widget_4x = 0x7f060011 +net.micode.notes:id/et_foler_name = 0x7f050014 +net.micode.notes:drawable/edit_green = 0x7f040008 +net.micode.notes:drawable/clock = 0x7f040004 +net.micode.notes:drawable/list_white_up = 0x7f04002c +net.micode.notes:id/gesture_overlay = 0x7f050016 +net.micode.notes:layout/dialog_edit_text = 0x7f060005 +net.micode.notes:string/preferences_account_title = 0x7f0a004d +net.micode.notes:drawable/edit_white = 0x7f04000f +net.micode.notes:drawable/list_white_middle = 0x7f04002a +net.micode.notes:color/user_query_highlight = 0x7f02000a +net.micode.notes:color/text_color_state_list = 0x7f020009 +net.micode.notes:drawable/list_white_down = 0x7f040029 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040046 +net.micode.notes:drawable/list_red_up = 0x7f040028 +net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000d +net.micode.notes:drawable/list_blue_down = 0x7f04001b net.micode.notes:id/action_select_all = 0x7f050002 -net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 -net.micode.notes:drawable/font_small = 0x7f040013 -net.micode.notes:string/sync_progress_login = 0x7f0a005e +net.micode.notes:drawable/list_green_middle = 0x7f040022 +net.micode.notes:string/menu_delete = 0x7f0a0028 +net.micode.notes:drawable/list_folder = 0x7f04001f +net.micode.notes:drawable/list_blue_up = 0x7f04001e +net.micode.notes:string/search_setting_description = 0x7f0a0061 +net.micode.notes:drawable/list_blue_single = 0x7f04001d +net.micode.notes:string/gesture_forgot_title = 0x7f0a0074 +net.micode.notes:drawable/widget_2x_yellow = 0x7f040041 +net.micode.notes:color/background_color = 0x7f020000 +net.micode.notes:string/menu_send_to_desktop = 0x7f0a003c +net.micode.notes:drawable/list_red_single = 0x7f040027 +net.micode.notes:style/CustomEditTextStyle = 0x7f0b0000 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004f +net.micode.notes:layout/widget_2x = 0x7f060010 +net.micode.notes:drawable/list_footer_bg = 0x7f040020 +net.micode.notes:string/preferences_add_account = 0x7f0a004e +net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 +net.micode.notes:drawable/edit_title_green = 0x7f04000b +net.micode.notes:drawable/icon_app = 0x7f040019 +net.micode.notes:drawable/font_small = 0x7f040015 +net.micode.notes:string/sync_progress_login = 0x7f0a0066 net.micode.notes:array/menu_share_ways = 0x7f010001 -net.micode.notes:drawable/widget_2x_white = 0x7f04003b -net.micode.notes:layout/folder_list_item = 0x7f060004 -net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/tv_title = 0x7f050040 -net.micode.notes:color/primary_text_dark = 0x7f020000 -net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 -net.micode.notes:drawable/list_blue_up = 0x7f04001a -net.micode.notes:string/search_setting_description = 0x7f0a0059 -net.micode.notes:drawable/list_blue_single = 0x7f040019 -net.micode.notes:drawable/font_large = 0x7f040010 -net.micode.notes:id/selection_menu = 0x7f050039 -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:string/confirm_gesture_pattern = 0x7f0a000a +net.micode.notes:color/hint_color = 0x7f020003 +net.micode.notes:drawable/widget_2x_white = 0x7f040040 +net.micode.notes:layout/folder_list_item = 0x7f060006 +net.micode.notes:layout/add_account_text = 0x7f060003 +net.micode.notes:color/gesture_success_color = 0x7f02001a +net.micode.notes:id/tv_title = 0x7f05004f +net.micode.notes:string/menu_sync_cancel = 0x7f0a0041 +net.micode.notes:drawable/ic_audio = 0x7f040017 +net.micode.notes:color/primary_text_dark = 0x7f020005 +net.micode.notes:drawable/font_size_selector_bg = 0x7f040014 +net.micode.notes:color/gesture_panel_background = 0x7f020015 +net.micode.notes:drawable/widget_4x_red = 0x7f040044 +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 +net.micode.notes:drawable/list_green_up = 0x7f040024 +net.micode.notes:id/btnBackToLogin = 0x7f050005 +net.micode.notes:drawable/font_large = 0x7f040012 +net.micode.notes:id/selection_menu = 0x7f050046 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a0025 net.micode.notes:id/add_img_btn = 0x7f050003 -net.micode.notes:drawable/delete = 0x7f040004 -net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:id/note_item = 0x7f050034 -net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:id/note_edit_list = 0x7f050032 -net.micode.notes:drawable/edit_title_red = 0x7f04000b -net.micode.notes:string/menu_delete = 0x7f0a0021 -net.micode.notes:drawable/list_folder = 0x7f04001b -net.micode.notes:drawable/call_record = 0x7f040002 -net.micode.notes:string/search_hint = 0x7f0a0057 -net.micode.notes:id/menu_font_size = 0x7f050025 +net.micode.notes:drawable/delete = 0x7f040005 +net.micode.notes:drawable/edit_yellow = 0x7f040010 +net.micode.notes:id/note_item = 0x7f050040 +net.micode.notes:string/search = 0x7f0a005e +net.micode.notes:id/cb_edit_item = 0x7f05000c +net.micode.notes:drawable/edit_title_white = 0x7f04000d +net.micode.notes:id/note_edit_list = 0x7f05003e +net.micode.notes:id/iv_alert_icon = 0x7f05001a +net.micode.notes:drawable/edit_red = 0x7f040009 +net.micode.notes:drawable/edit_title_red = 0x7f04000c +net.micode.notes:drawable/edit_title_blue = 0x7f04000a +net.micode.notes:drawable/call_record = 0x7f040003 +net.micode.notes:drawable/list_yellow_up = 0x7f040030 +net.micode.notes:string/error_sync_internal = 0x7f0a0014 +net.micode.notes:drawable/menu_delete = 0x7f040031 +net.micode.notes:string/search_hint = 0x7f0a005f +net.micode.notes:id/menu_font_size = 0x7f050031 net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 -net.micode.notes:drawable/list_yellow_up = 0x7f04002c +net.micode.notes:string/cancel = 0x7f0a0071 net.micode.notes:dimen/text_font_size_small = 0x7f030003 +net.micode.notes:string/gesture_verify_hint = 0x7f0a0070 net.micode.notes:dimen/text_font_size_normal = 0x7f030002 -net.micode.notes:drawable/list_green_middle = 0x7f04001e -net.micode.notes:drawable/list_background = 0x7f040016 -net.micode.notes:string/app_name = 0x7f0a0004 +net.micode.notes:string/gesture_password_set = 0x7f0a0022 +net.micode.notes:drawable/list_background = 0x7f04001a net.micode.notes:menu/note_list_dropdown = 0x7f070004 -net.micode.notes:string/menu_setting = 0x7f0a0036 +net.micode.notes:id/iv_lock_icon = 0x7f050055 +net.micode.notes:string/menu_setting = 0x7f0a003e net.micode.notes:dimen/text_font_size_medium = 0x7f030001 -net.micode.notes:layout/note_edit_list_item = 0x7f060006 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0057 +net.micode.notes:id/note_edit_view = 0x7f05003f +net.micode.notes:drawable/edittext_background = 0x7f040011 +net.micode.notes:string/gesture_instruction = 0x7f0a001f +net.micode.notes:id/iv_bg_red_select = 0x7f050020 +net.micode.notes:id/tv_title_bar = 0x7f050050 +net.micode.notes:color/text_color = 0x7f020008 +net.micode.notes:id/navigation_bar = 0x7f05003c +net.micode.notes:layout/note_edit_list_item = 0x7f060009 net.micode.notes:layout/account_dialog_title = 0x7f060000 net.micode.notes:array/format_for_exported_note = 0x7f010000 +net.micode.notes:layout/note_gesture_password = 0x7f06000a +net.micode.notes:drawable/list_yellow_middle = 0x7f04002e +net.micode.notes:color/button_color = 0x7f020001 +net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 +net.micode.notes:drawable/list_green_single = 0x7f040023 diff --git a/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/arm64-v8a/libjnidispatch.so b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/arm64-v8a/libjnidispatch.so new file mode 100644 index 0000000..61553b2 Binary files /dev/null and b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/arm64-v8a/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/arm64-v8a/libvosk.so b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/arm64-v8a/libvosk.so new file mode 100644 index 0000000..0746b58 Binary files /dev/null and b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/arm64-v8a/libvosk.so differ diff --git a/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/armeabi-v7a/libjnidispatch.so b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/armeabi-v7a/libjnidispatch.so new file mode 100644 index 0000000..0683481 Binary files /dev/null and b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/armeabi-v7a/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/armeabi-v7a/libvosk.so b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/armeabi-v7a/libvosk.so new file mode 100644 index 0000000..d2daebf Binary files /dev/null and b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/armeabi-v7a/libvosk.so differ diff --git a/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86/libjnidispatch.so b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86/libjnidispatch.so new file mode 100644 index 0000000..8587fdf Binary files /dev/null and b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86/libvosk.so b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86/libvosk.so new file mode 100644 index 0000000..6ffc041 Binary files /dev/null and b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86/libvosk.so differ diff --git a/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86_64/libjnidispatch.so b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86_64/libjnidispatch.so new file mode 100644 index 0000000..e3475dc Binary files /dev/null and b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86_64/libjnidispatch.so differ diff --git a/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86_64/libvosk.so b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86_64/libvosk.so new file mode 100644 index 0000000..3ecff4c Binary files /dev/null and b/Src/app/build/intermediates/stripped_native_libs/debug/out/lib/x86_64/libvosk.so differ diff --git a/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt new file mode 100644 index 0000000..8dcfc98 --- /dev/null +++ b/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt @@ -0,0 +1,360 @@ +net.micode.notes +array format_for_exported_note +array menu_share_ways +color background_color +color button_color +color button_text_color +color gesture_background +color gesture_button_background +color gesture_button_ripple +color gesture_button_text +color gesture_error_color +color gesture_hint_color +color gesture_icon_color +color gesture_line_error +color gesture_line_normal +color gesture_link_color +color gesture_panel_background +color gesture_panel_border +color gesture_point_error +color gesture_point_normal +color gesture_point_selected +color gesture_success_color +color gesture_text_color +color hint_color +color primary_text_dark +color secondary_text_dark +color text_color +color text_color_state_list +color user_query_highlight +dimen text_font_size_large +dimen text_font_size_medium +dimen text_font_size_normal +dimen text_font_size_small +dimen text_font_size_super +drawable bg_btn_set_color +drawable bg_color_btn_mask +drawable button_background +drawable call_record +drawable clock +drawable delete +drawable dropdown_icon +drawable edit_blue +drawable edit_green +drawable edit_red +drawable edit_title_blue +drawable edit_title_green +drawable edit_title_red +drawable edit_title_white +drawable edit_title_yellow +drawable edit_white +drawable edit_yellow +drawable edittext_background +drawable font_large +drawable font_normal +drawable font_size_selector_bg +drawable font_small +drawable font_super +drawable gesture_background +drawable gesture_button_background +drawable gesture_panel_background +drawable ic_audio +drawable ic_lock_outline +drawable ic_warning +drawable icon_app +drawable list_background +drawable list_blue_down +drawable list_blue_middle +drawable list_blue_single +drawable list_blue_up +drawable list_folder +drawable list_footer_bg +drawable list_green_down +drawable list_green_middle +drawable list_green_single +drawable list_green_up +drawable list_red_down +drawable list_red_middle +drawable list_red_single +drawable list_red_up +drawable list_white_down +drawable list_white_middle +drawable list_white_single +drawable list_white_up +drawable list_yellow_down +drawable list_yellow_middle +drawable list_yellow_single +drawable list_yellow_up +drawable menu_delete +drawable menu_move +drawable new_note +drawable new_note_normal +drawable new_note_pressed +drawable note_edit_color_selector_panel +drawable notification +drawable search_result +drawable selected +drawable title_alert +drawable title_bar_bg +drawable toast_background +drawable widget_2x_blue +drawable widget_2x_green +drawable widget_2x_red +drawable widget_2x_white +drawable widget_2x_yellow +drawable widget_4x_blue +drawable widget_4x_green +drawable widget_4x_red +drawable widget_4x_white +drawable widget_4x_yellow +id account_dialog_subtitle +id account_dialog_title +id action_select_all +id add_img_btn +id amPm +id btnBackToLogin +id btnLogin +id btnRegister +id btn_confirm +id btn_logout +id btn_new_note +id btn_set_bg_color +id cb_edit_item +id date +id delete +id etLoginPassword +id etLoginUsername +id etPassword +id etUsername +id et_edit_text +id et_foler_name +id font_size_selector +id gesture_status +id hour +id imageView +id iv_alert_icon +id iv_bg_blue +id iv_bg_blue_select +id iv_bg_green +id iv_bg_green_select +id iv_bg_red +id iv_bg_red_select +id iv_bg_white +id iv_bg_white_select +id iv_bg_yellow +id iv_bg_yellow_select +id iv_large_select +id iv_lock_icon +id iv_medium_select +id iv_small_select +id iv_super_select +id ll_font_large +id ll_font_normal +id ll_font_small +id ll_font_super +id lock_pattern_view +id menu_alert +id menu_delete +id menu_delete_remind +id menu_export_text +id menu_font_size +id menu_list_mode +id menu_new_folder +id menu_new_note +id menu_search +id menu_send_to_desktop +id menu_set_gesture +id menu_setting +id menu_share +id menu_sync +id minute +id move +id navigation_bar +id note_bg_color_selector +id note_edit_list +id note_edit_view +id note_item +id note_title +id notes_list +id prefenerece_sync_status_textview +id preference_sync_button +id record_audio_btn +id selection_menu +id speech_to_text_btn +id sv_note_edit +id textView +id tv_alert_date +id tv_folder_name +id tv_forgot_pattern +id tv_modified_date +id tv_name +id tv_time +id tv_title +id tv_title_bar +id widget_bg_image +id widget_text +layout account_dialog_title +layout activity_login +layout activity_register +layout add_account_text +layout datetime_picker +layout dialog_edit_text +layout folder_list_item +layout layout_custom_toast +layout note_edit +layout note_edit_list_item +layout note_gesture_password +layout note_gesture_verify +layout note_item +layout note_list +layout note_list_dropdown_menu +layout note_list_footer +layout settings_header +layout widget_2x +layout widget_4x +menu call_note_edit +menu call_record_folder +menu note_edit +menu note_list +menu note_list_dropdown +menu note_list_options +menu sub_folder +plurals search_results_title +raw introduction +string alert_message_delete_folder +string alert_message_delete_note +string alert_message_delete_notes +string alert_title_delete +string app_name +string app_widget2x2 +string app_widget4x4 +string button_delete +string call_record_folder_name +string cancel +string confirm_gesture +string confirm_gesture_pattern +string datetime_dialog_cancel +string datetime_dialog_ok +string delete_remind_time_message +string error_note_empty_for_clock +string error_note_empty_for_send_to_desktop +string error_note_not_exist +string error_sdcard_export +string error_sdcard_unmounted +string error_sync_cancelled +string error_sync_internal +string error_sync_network +string failed_sdcard_export +string file_name_txt_format +string file_path +string folder_exist +string format_date_ymd +string format_datetime_mdhm +string format_exported_file_location +string format_folder_files_count +string format_move_notes_to_folder +string gesture_forgot_message +string gesture_forgot_pattern +string gesture_forgot_title +string gesture_instruction +string gesture_matched +string gesture_not_matched +string gesture_password_set +string gesture_too_short +string gesture_verify_error +string gesture_verify_fail_max +string gesture_verify_fail_tries +string gesture_verify_hint +string gesture_verify_success +string hint_foler_name +string info_note_enter_desktop +string menu_alert +string menu_create_folder +string menu_delete +string menu_deselect_all +string menu_export_text +string menu_folder_change_name +string menu_folder_delete +string menu_folder_view +string menu_font_large +string menu_font_normal +string menu_font_size +string menu_font_small +string menu_font_super +string menu_list_mode +string menu_move +string menu_move_parent_folder +string menu_normal_mode +string menu_remove_remind +string menu_search +string menu_select_all +string menu_select_none +string menu_select_title +string menu_send_to_desktop +string menu_set_gesture +string menu_setting +string menu_share +string menu_sync +string menu_sync_cancel +string menu_title_select_folder +string note_alert_expired +string note_link_email +string note_link_other +string note_link_tel +string note_link_web +string notealert_enter +string notealert_ok +string notelist_menu_new +string notelist_string_info +string ok +string preferences_account_summary +string preferences_account_title +string preferences_add_account +string preferences_bg_random_appear_title +string preferences_button_sync_cancel +string preferences_button_sync_immediately +string preferences_dialog_change_account_title +string preferences_dialog_change_account_warn_msg +string preferences_dialog_select_account_tips +string preferences_dialog_select_account_title +string preferences_last_sync_time +string preferences_last_sync_time_format +string preferences_menu_cancel +string preferences_menu_change_account +string preferences_menu_remove_account +string preferences_title +string preferences_toast_cannot_change_account +string preferences_toast_success_set_accout +string search +string search_hint +string search_label +string search_setting_description +string set_remind_time_message +string success_sdcard_export +string success_sync_account +string sync_progress_init_list +string sync_progress_login +string sync_progress_syncing +string ticker_cancel +string ticker_fail +string ticker_success +string ticker_syncing +string widget_havenot_content +string widget_under_visit_mode +style CustomEditTextStyle +style GestureVerifyTheme +style HighlightTextAppearancePrimary +style HighlightTextAppearanceSecondary +style NoteActionBarStyle +style NoteTheme +style TextAppearanceLarge +style TextAppearanceMedium +style TextAppearanceNormal +style TextAppearancePrimaryItem +style TextAppearanceSecondaryItem +style TextAppearanceSuper +style TextAppearanceUnderMenuIcon +xml preferences +xml searchable +xml widget_2x_info +xml widget_4x_info diff --git a/Src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk b/Src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk new file mode 100644 index 0000000..33e9842 Binary files /dev/null and b/Src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk differ diff --git a/Src/app/build/outputs/apk/debug/output-metadata.json b/Src/app/build/outputs/apk/androidTest/debug/output-metadata.json similarity index 54% rename from Src/app/build/outputs/apk/debug/output-metadata.json rename to Src/app/build/outputs/apk/androidTest/debug/output-metadata.json index b2231b9..b9c23aa 100644 --- a/Src/app/build/outputs/apk/debug/output-metadata.json +++ b/Src/app/build/outputs/apk/androidTest/debug/output-metadata.json @@ -4,16 +4,16 @@ "type": "APK", "kind": "Directory" }, - "applicationId": "net.micode.notes", - "variantName": "debug", + "applicationId": "net.micode.notes.test", + "variantName": "debugAndroidTest", "elements": [ { "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "app-debug.apk" + "versionCode": 0, + "versionName": "", + "outputFile": "app-debug-androidTest.apk" } ], "elementType": "File" diff --git a/Src/app/build/outputs/apk/debug/app-debug.apk b/Src/app/build/outputs/apk/debug/app-debug.apk deleted file mode 100644 index dbbd586..0000000 Binary files a/Src/app/build/outputs/apk/debug/app-debug.apk and /dev/null differ diff --git a/Src/app/build/outputs/logs/manifest-merger-debug-report.txt b/Src/app/build/outputs/logs/manifest-merger-debug-report.txt index 9c6b64b..75e50fb 100644 --- a/Src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/Src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,241 +1,258 @@ -- Merging decision tree log --- manifest -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12 +MERGED from [com.alphacephei:vosk-android:0.3.38] D:\Notes\caches\transforms-3\56c56b617d8c6655fd5dde2ec0086806\transformed\vosk-android-0.3.38\AndroidManifest.xml:2:1-9:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12 package - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:6:5-31 - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:4:5-31 + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:8:5-30 - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:6:5-30 + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml xmlns:tools - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:5:5-51 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:3:5-51 xmlns:android - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:11-69 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:11-69 android:versionCode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:7:5-28 - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml -uses-sdk -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 - android:targetSdkVersion - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - android:minSdkVersion - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:15-41 - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:5:5-28 + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml +uses-permission#android.permission.RECORD_AUDIO +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:9:5-71 + android:name + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:9:22-68 +uses-permission#android.permission.MODIFY_AUDIO_SETTINGS +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:10:5-80 + android:name + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:10:22-77 uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:5-81 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:11:5-81 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:22-78 -uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:5-88 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:11:22-78 +uses-permission#android.permission.READ_EXTERNAL_STORAGE +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:12:5-80 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:22-85 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:12:22-77 uses-permission#android.permission.INTERNET -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:16:5-67 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:13:5-67 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:16:22-64 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:13:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:17:5-72 - android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:17:22-69 -uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:18:5-74 - android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:18:22-71 -uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:19:5-80 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:14:5-72 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:19:22-77 -uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:20:5-71 - android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:20:22-68 -uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:21:5-74 - android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:21:22-71 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:14:22-69 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:22:5-81 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:5-81 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:22:22-78 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:22-78 application -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:25:5-146:19 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-145:19 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:27:9-41 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41 android:icon - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:26:9-42 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:18:9-42 +activity#net.micode.notes.login.LoginActivity +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:22:9-29:20 + android:launchMode + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:24:13-43 + android:name + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:23:13-48 +intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:25:13-28:29 +action#android.intent.action.MAIN +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:17-69 + android:name + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:25-66 +category#android.intent.category.LAUNCHER +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:17-77 + android:name + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:27-74 +activity#net.micode.notes.login.RegisterActivity +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:9-60 + android:name + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:19-57 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:29:9-41:20 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:34:9-40:55 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:32:13-45 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:37:13-45 android:launchMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:33:13-43 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:38:13-43 android:windowSoftInputMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:36:13-52 - android:uiOptions - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:35:13-57 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:40:13-52 android:configChanges - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:31:13-74 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:36:13-74 android:theme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:34:13-45 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:39:13-45 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:30:13-49 -intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:37:13-40:29 -action#android.intent.action.MAIN -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:38:17-69 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:35:13-49 +activity#net.micode.notes.ui.NoteGesturePasswordActivity +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:41:9-44:70 + android:label + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:43:13-53 + android:theme + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:44:13-67 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:38:25-66 -category#android.intent.category.LAUNCHER -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:39:17-77 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:42:13-59 +activity#net.micode.notes.ui.NoteGestureVerifyActivity +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:45:9-49:63 + android:screenOrientation + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:48:13-49 + android:windowSoftInputMode + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:49:13-60 + android:theme + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:39:27-74 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:44:9-76:20 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-77:20 android:launchMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:47:13-43 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:54:13-43 android:configChanges - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:46:13-74 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:13-74 android:theme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:48:13-45 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-45 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:45:13-48 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:52:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:13-58:29 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-63:29 android:scheme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:51:17-38 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:17-38 tools:ignore - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:52:17-47 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:58:17-47 action#android.intent.action.VIEW -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:53:17-69 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-69 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:53:25-66 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:25-66 category#android.intent.category.DEFAULT -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:17-76 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-76 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:27-73 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:27-73 data -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:17-78 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78 android:mimeType - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:23-75 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:60:13-66:29 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:64:13-69:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:61:17-79 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:17-79 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:61:25-76 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:68:13-71:29 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:70:13-73:29 action#android.intent.action.SEARCH -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:69:17-71 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:17-71 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:69:25-68 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:25-68 meta-data#android.app.searchable -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:73:13-75:54 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:74:13-76:54 android:resource - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:75:17-51 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:17-51 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:74:17-54 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:75:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:79:9-82:43 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:80:9-83:43 android:authorities - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:81:13-47 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:13-47 android:multiprocess - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:82:13-40 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-40 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:80:13-63 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:81:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:85:9-96:20 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:86:9-96:20 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:87:13-50 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:13-50 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:86:13-57 -intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:88:13-92:29 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:87:13-57 +intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-92:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:17-84 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:17-84 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:25-81 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:17-85 - android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:17-85 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:17-85 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:25-82 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:25-82 meta-data#android.appwidget.provider -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:93:13-95:58 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:13-95:58 android:resource - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:95:17-55 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:17-55 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:94:17-58 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:94:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:98:9-109:20 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:98:9-108:20 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:100:13-50 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:13-50 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:99:13-57 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:99:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:112:9-116:20 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:9-115:20 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:112:19-55 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:113:13-115:29 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:112:13-114:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:114:17-79 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:17-79 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:114:25-76 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:119:9-121:50 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:118:9-120:41 android:process - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:121:13-38 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:13-38 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:120:13-61 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:119:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:124:9-128:87 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:123:9-127:87 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:126:13-45 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:13-45 android:launchMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:127:13-48 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-48 android:theme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:128:13-75 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-75 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:125:13-50 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:124:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:131:9-135:72 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:130:9-134:72 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:133:13-54 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:13-54 android:launchMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:134:13-43 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-43 android:theme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:135:13-60 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-60 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:132:13-71 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:131:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:138:9-140:48 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:137:9-139:40 android:exported - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:140:13-37 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:13-37 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:139:13-74 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:138:13-74 meta-data#android.app.default_searchable -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:143:9-145:52 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:142:9-144:52 android:value - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:145:13-49 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:13-49 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:144:13-58 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:143:13-58 +uses-sdk +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml +MERGED from [com.alphacephei:vosk-android:0.3.38] D:\Notes\caches\transforms-3\56c56b617d8c6655fd5dde2ec0086806\transformed\vosk-android-0.3.38\AndroidManifest.xml:5:5-7:41 +MERGED from [com.alphacephei:vosk-android:0.3.38] D:\Notes\caches\transforms-3\56c56b617d8c6655fd5dde2ec0086806\transformed\vosk-android-0.3.38\AndroidManifest.xml:5:5-7:41 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + android:targetSdkVersion + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + android:minSdkVersion + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml diff --git a/Src/app/build/tmp/compileDebugAndroidTestJavaWithJavac/previous-compilation-data.bin b/Src/app/build/tmp/compileDebugAndroidTestJavaWithJavac/previous-compilation-data.bin new file mode 100644 index 0000000..00ea7f9 Binary files /dev/null and b/Src/app/build/tmp/compileDebugAndroidTestJavaWithJavac/previous-compilation-data.bin differ diff --git a/Src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/Src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 6ad11ce..638de90 100644 Binary files a/Src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/Src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/Src/app/src/main/AndroidManifest.xml b/Src/app/src/main/AndroidManifest.xml index a0cf89e..984b057 100644 --- a/Src/app/src/main/AndroidManifest.xml +++ b/Src/app/src/main/AndroidManifest.xml @@ -1,75 +1,76 @@ - - - + - - - + + - + - - - - - - + + + android:name=".login.LoginActivity" + android:launchMode="singleTop"> + + + + + + - - - - - - @@ -81,27 +82,25 @@ android:authorities="micode_notes" android:multiprocess="true" /> - + - - + - - + + android:process=":remote" /> + android:exported="false" /> + + + diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/README b/Src/app/src/main/assets/vosk-model-small-cn-0.22/README new file mode 100644 index 0000000..0b5d9e5 --- /dev/null +++ b/Src/app/src/main/assets/vosk-model-small-cn-0.22/README @@ -0,0 +1,6 @@ +Chinese Vosk model for mobile + +CER results + +23.54% speechio_02 +38.29% speechio_06 diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/am/final.mdl b/Src/app/src/main/assets/vosk-model-small-cn-0.22/am/final.mdl new file mode 100644 index 0000000..f7cf1de Binary files /dev/null and b/Src/app/src/main/assets/vosk-model-small-cn-0.22/am/final.mdl differ diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/conf/mfcc.conf b/Src/app/src/main/assets/vosk-model-small-cn-0.22/conf/mfcc.conf new file mode 100644 index 0000000..12fdad4 --- /dev/null +++ b/Src/app/src/main/assets/vosk-model-small-cn-0.22/conf/mfcc.conf @@ -0,0 +1,8 @@ +--use-energy=false +--sample-frequency=16000 +--num-mel-bins=40 +--num-ceps=40 +--low-freq=40 +--high-freq=-200 +--allow-upsample=true +--allow-downsample=true diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/conf/model.conf b/Src/app/src/main/assets/vosk-model-small-cn-0.22/conf/model.conf new file mode 100644 index 0000000..9ae12a7 --- /dev/null +++ b/Src/app/src/main/assets/vosk-model-small-cn-0.22/conf/model.conf @@ -0,0 +1,10 @@ +--min-active=200 +--max-active=5000 +--beam=12.0 +--lattice-beam=4.0 +--acoustic-scale=1.0 +--frame-subsampling-factor=3 +--endpoint.silence-phones=1:2:3:4:5:6:7:8:9:10 +--endpoint.rule2.min-trailing-silence=0.5 +--endpoint.rule3.min-trailing-silence=1.0 +--endpoint.rule4.min-trailing-silence=2.0 diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/Gr.fst b/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/Gr.fst new file mode 100644 index 0000000..ee4580d Binary files /dev/null and b/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/Gr.fst differ diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/HCLr.fst b/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/HCLr.fst new file mode 100644 index 0000000..2ad6e8f Binary files /dev/null and b/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/HCLr.fst differ diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/disambig_tid.int b/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/disambig_tid.int new file mode 100644 index 0000000..c1a114f --- /dev/null +++ b/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/disambig_tid.int @@ -0,0 +1,39 @@ +11845 +11846 +11847 +11848 +11849 +11850 +11851 +11852 +11853 +11854 +11855 +11856 +11857 +11858 +11859 +11860 +11861 +11862 +11863 +11864 +11865 +11866 +11867 +11868 +11869 +11870 +11871 +11872 +11873 +11874 +11875 +11876 +11877 +11878 +11879 +11880 +11881 +11882 +11883 diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/phones/word_boundary.int b/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/phones/word_boundary.int new file mode 100644 index 0000000..9f3713e --- /dev/null +++ b/Src/app/src/main/assets/vosk-model-small-cn-0.22/graph/phones/word_boundary.int @@ -0,0 +1,646 @@ +1 nonword +2 begin +3 end +4 internal +5 singleton +6 nonword +7 begin +8 end +9 internal +10 singleton +11 begin +12 end +13 internal +14 singleton +15 begin +16 end +17 internal +18 singleton +19 begin +20 end +21 internal +22 singleton +23 begin +24 end +25 internal +26 singleton +27 begin +28 end +29 internal +30 singleton +31 begin +32 end +33 internal +34 singleton +35 begin +36 end +37 internal +38 singleton +39 begin +40 end +41 internal +42 singleton +43 begin +44 end +45 internal +46 singleton +47 begin +48 end +49 internal +50 singleton +51 begin +52 end +53 internal +54 singleton +55 begin +56 end +57 internal +58 singleton +59 begin +60 end +61 internal +62 singleton +63 begin +64 end +65 internal +66 singleton +67 begin +68 end +69 internal +70 singleton +71 begin +72 end +73 internal +74 singleton +75 begin +76 end +77 internal +78 singleton +79 begin +80 end +81 internal +82 singleton +83 begin +84 end +85 internal +86 singleton +87 begin +88 end +89 internal +90 singleton +91 begin +92 end +93 internal +94 singleton +95 begin +96 end +97 internal +98 singleton +99 begin +100 end +101 internal +102 singleton +103 begin +104 end +105 internal +106 singleton +107 begin +108 end +109 internal +110 singleton +111 begin +112 end +113 internal +114 singleton +115 begin +116 end +117 internal +118 singleton +119 begin +120 end +121 internal +122 singleton +123 begin +124 end +125 internal +126 singleton +127 begin +128 end +129 internal +130 singleton +131 begin +132 end +133 internal +134 singleton +135 begin +136 end +137 internal +138 singleton +139 begin +140 end +141 internal +142 singleton +143 begin +144 end +145 internal +146 singleton +147 begin +148 end +149 internal +150 singleton +151 begin +152 end +153 internal +154 singleton +155 begin +156 end +157 internal +158 singleton +159 begin +160 end +161 internal +162 singleton +163 begin +164 end +165 internal +166 singleton +167 begin +168 end +169 internal +170 singleton +171 begin +172 end +173 internal +174 singleton +175 begin +176 end +177 internal +178 singleton +179 begin +180 end +181 internal +182 singleton +183 begin +184 end +185 internal +186 singleton +187 begin +188 end +189 internal +190 singleton +191 begin +192 end +193 internal +194 singleton +195 begin +196 end +197 internal +198 singleton +199 begin +200 end +201 internal +202 singleton +203 begin +204 end +205 internal +206 singleton +207 begin +208 end +209 internal +210 singleton +211 begin +212 end +213 internal +214 singleton +215 begin +216 end +217 internal +218 singleton +219 begin +220 end +221 internal +222 singleton +223 begin +224 end +225 internal +226 singleton +227 begin +228 end +229 internal +230 singleton +231 begin +232 end +233 internal +234 singleton +235 begin +236 end +237 internal +238 singleton +239 begin +240 end +241 internal +242 singleton +243 begin +244 end +245 internal +246 singleton +247 begin +248 end +249 internal +250 singleton +251 begin +252 end +253 internal +254 singleton +255 begin +256 end +257 internal +258 singleton +259 begin +260 end +261 internal +262 singleton +263 begin +264 end +265 internal +266 singleton +267 begin +268 end +269 internal +270 singleton +271 begin +272 end +273 internal +274 singleton +275 begin +276 end +277 internal +278 singleton +279 begin +280 end +281 internal +282 singleton +283 begin +284 end +285 internal +286 singleton +287 begin +288 end +289 internal +290 singleton +291 begin +292 end +293 internal +294 singleton +295 begin +296 end +297 internal +298 singleton +299 begin +300 end +301 internal +302 singleton +303 begin +304 end +305 internal +306 singleton +307 begin +308 end +309 internal +310 singleton +311 begin +312 end +313 internal +314 singleton +315 begin +316 end +317 internal +318 singleton +319 begin +320 end +321 internal +322 singleton +323 begin +324 end +325 internal +326 singleton +327 begin +328 end +329 internal +330 singleton +331 begin +332 end +333 internal +334 singleton +335 begin +336 end +337 internal +338 singleton +339 begin +340 end +341 internal +342 singleton +343 begin +344 end +345 internal +346 singleton +347 begin +348 end +349 internal +350 singleton +351 begin +352 end +353 internal +354 singleton +355 begin +356 end +357 internal +358 singleton +359 begin +360 end +361 internal +362 singleton +363 begin +364 end +365 internal +366 singleton +367 begin +368 end +369 internal +370 singleton +371 begin +372 end +373 internal +374 singleton +375 begin +376 end +377 internal +378 singleton +379 begin +380 end +381 internal +382 singleton +383 begin +384 end +385 internal +386 singleton +387 begin +388 end +389 internal +390 singleton +391 begin +392 end +393 internal +394 singleton +395 begin +396 end +397 internal +398 singleton +399 begin +400 end +401 internal +402 singleton +403 begin +404 end +405 internal +406 singleton +407 begin +408 end +409 internal +410 singleton +411 begin +412 end +413 internal +414 singleton +415 begin +416 end +417 internal +418 singleton +419 begin +420 end +421 internal +422 singleton +423 begin +424 end +425 internal +426 singleton +427 begin +428 end +429 internal +430 singleton +431 begin +432 end +433 internal +434 singleton +435 begin +436 end +437 internal +438 singleton +439 begin +440 end +441 internal +442 singleton +443 begin +444 end +445 internal +446 singleton +447 begin +448 end +449 internal +450 singleton +451 begin +452 end +453 internal +454 singleton +455 begin +456 end +457 internal +458 singleton +459 begin +460 end +461 internal +462 singleton +463 begin +464 end +465 internal +466 singleton +467 begin +468 end +469 internal +470 singleton +471 begin +472 end +473 internal +474 singleton +475 begin +476 end +477 internal +478 singleton +479 begin +480 end +481 internal +482 singleton +483 begin +484 end +485 internal +486 singleton +487 begin +488 end +489 internal +490 singleton +491 begin +492 end +493 internal +494 singleton +495 begin +496 end +497 internal +498 singleton +499 begin +500 end +501 internal +502 singleton +503 begin +504 end +505 internal +506 singleton +507 begin +508 end +509 internal +510 singleton +511 begin +512 end +513 internal +514 singleton +515 begin +516 end +517 internal +518 singleton +519 begin +520 end +521 internal +522 singleton +523 begin +524 end +525 internal +526 singleton +527 begin +528 end +529 internal +530 singleton +531 begin +532 end +533 internal +534 singleton +535 begin +536 end +537 internal +538 singleton +539 begin +540 end +541 internal +542 singleton +543 begin +544 end +545 internal +546 singleton +547 begin +548 end +549 internal +550 singleton +551 begin +552 end +553 internal +554 singleton +555 begin +556 end +557 internal +558 singleton +559 begin +560 end +561 internal +562 singleton +563 begin +564 end +565 internal +566 singleton +567 begin +568 end +569 internal +570 singleton +571 begin +572 end +573 internal +574 singleton +575 begin +576 end +577 internal +578 singleton +579 begin +580 end +581 internal +582 singleton +583 begin +584 end +585 internal +586 singleton +587 begin +588 end +589 internal +590 singleton +591 begin +592 end +593 internal +594 singleton +595 begin +596 end +597 internal +598 singleton +599 begin +600 end +601 internal +602 singleton +603 begin +604 end +605 internal +606 singleton +607 begin +608 end +609 internal +610 singleton +611 begin +612 end +613 internal +614 singleton +615 begin +616 end +617 internal +618 singleton +619 begin +620 end +621 internal +622 singleton +623 begin +624 end +625 internal +626 singleton +627 begin +628 end +629 internal +630 singleton +631 begin +632 end +633 internal +634 singleton +635 begin +636 end +637 internal +638 singleton +639 begin +640 end +641 internal +642 singleton +643 begin +644 end +645 internal +646 singleton diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/final.dubm b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/final.dubm new file mode 100644 index 0000000..bcf2689 Binary files /dev/null and b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/final.dubm differ diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/final.ie b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/final.ie new file mode 100644 index 0000000..e1d78a2 Binary files /dev/null and b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/final.ie differ diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/final.mat b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/final.mat new file mode 100644 index 0000000..1093236 Binary files /dev/null and b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/final.mat differ diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/global_cmvn.stats b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/global_cmvn.stats new file mode 100644 index 0000000..500cc40 --- /dev/null +++ b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/global_cmvn.stats @@ -0,0 +1,3 @@ + [ + 1.117107e+11 -7.827721e+08 -1.101398e+10 -2.193934e+09 -1.347332e+10 -1.613916e+10 -1.199561e+10 -1.255081e+10 -1.638895e+10 -3.821099e+09 -1.372833e+10 -5.244242e+09 -1.098187e+10 -3.655235e+09 -9.364579e+09 -4.285302e+09 -6.296873e+09 -1.552953e+09 -3.176746e+09 -1.202976e+08 -9.857023e+08 2.316555e+08 -1.61059e+08 -5.891868e+07 3.465849e+08 -1.842054e+08 3.248211e+08 -1.483965e+08 3.739239e+08 -6.672061e+08 4.442288e+08 -9.274889e+08 5.142684e+08 4.292036e+07 2.206386e+08 -4.532715e+08 -2.092499e+08 -3.70488e+08 -8.079404e+07 -8.425977e+07 1.344125e+09 + 9.982632e+12 1.02635e+12 8.634624e+11 9.06451e+11 9.652096e+11 1.12772e+12 9.468372e+11 9.141218e+11 9.670484e+11 6.936961e+11 8.141006e+11 6.256321e+11 6.087707e+11 4.616898e+11 4.212042e+11 2.862872e+11 2.498089e+11 1.470856e+11 1.099197e+11 5.780894e+10 3.118114e+10 1.060667e+10 1.466199e+09 4.173056e+08 5.257362e+09 1.277714e+10 2.114478e+10 2.974502e+10 3.587691e+10 4.078971e+10 4.247745e+10 4.382608e+10 4.62521e+10 4.575282e+10 3.546206e+10 3.041531e+10 2.838562e+10 2.258604e+10 1.715295e+10 1.303227e+10 0 ] diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/online_cmvn.conf b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/online_cmvn.conf new file mode 100644 index 0000000..e69de29 diff --git a/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/splice.conf b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/splice.conf new file mode 100644 index 0000000..960cd2e --- /dev/null +++ b/Src/app/src/main/assets/vosk-model-small-cn-0.22/ivector/splice.conf @@ -0,0 +1,2 @@ +--left-context=3 +--right-context=3 diff --git a/Src/app/src/main/java/net/micode/notes/.vs/ProjectSettings.json b/Src/app/src/main/java/net/micode/notes/.vs/ProjectSettings.json deleted file mode 100644 index f8b4888..0000000 --- a/Src/app/src/main/java/net/micode/notes/.vs/ProjectSettings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "CurrentProjectSetting": null -} \ No newline at end of file diff --git a/Src/app/src/main/java/net/micode/notes/.vs/VSWorkspaceState.json b/Src/app/src/main/java/net/micode/notes/.vs/VSWorkspaceState.json deleted file mode 100644 index facbe54..0000000 --- a/Src/app/src/main/java/net/micode/notes/.vs/VSWorkspaceState.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "ExpandedNodes": [ - "", - "\\data" - ], - "SelectedNode": "\\data\\UserDao.java", - "PreviewInSolutionExplorer": false -} \ No newline at end of file diff --git a/Src/app/src/main/java/net/micode/notes/.vs/notes/FileContentIndex/92377f42-8e25-4653-b87b-f5c95d05f010.vsidx b/Src/app/src/main/java/net/micode/notes/.vs/notes/FileContentIndex/92377f42-8e25-4653-b87b-f5c95d05f010.vsidx deleted file mode 100644 index 5772582..0000000 Binary files a/Src/app/src/main/java/net/micode/notes/.vs/notes/FileContentIndex/92377f42-8e25-4653-b87b-f5c95d05f010.vsidx and /dev/null differ diff --git a/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/.wsuo b/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/.wsuo deleted file mode 100644 index 2e0eb16..0000000 Binary files a/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/.wsuo and /dev/null differ diff --git a/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/DocumentLayout.backup.json b/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/DocumentLayout.backup.json deleted file mode 100644 index 8ec6b23..0000000 --- a/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/DocumentLayout.backup.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "Version": 1, - "WorkspaceRootPath": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\", - "Documents": [ - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Notes.java||{8B382828-6202-11D1-8870-0000F87579D2}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:data\\Notes.java||{8B382828-6202-11D1-8870-0000F87579D2}" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java||{8B382828-6202-11D1-8870-0000F87579D2}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:data\\Contact.java||{8B382828-6202-11D1-8870-0000F87579D2}" - } - ], - "DocumentGroupContainers": [ - { - "Orientation": 0, - "VerticalTabListWidth": 256, - "DocumentGroups": [ - { - "DockedWidth": 200, - "SelectedChildIndex": 2, - "Children": [ - { - "$type": "Document", - "DocumentIndex": 1, - "Title": "Contact.java", - "DocumentMoniker": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java", - "RelativeDocumentMoniker": "data\\Contact.java", - "ToolTip": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java", - "RelativeToolTip": "data\\Contact.java", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", - "WhenOpened": "2024-12-30T08:30:43.773Z", - "IsPinned": true, - "EditorCaption": "" - }, - { - "$type": "Bookmark", - "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" - }, - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "Notes.java", - "DocumentMoniker": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Notes.java", - "RelativeDocumentMoniker": "data\\Notes.java", - "ToolTip": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Notes.java", - "RelativeToolTip": "data\\Notes.java", - "ViewState": "AgIAAGkAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", - "WhenOpened": "2024-12-30T08:32:46.793Z", - "EditorCaption": "" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/DocumentLayout.json b/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/DocumentLayout.json deleted file mode 100644 index bed55ec..0000000 --- a/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/DocumentLayout.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "Version": 1, - "WorkspaceRootPath": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\", - "Documents": [ - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java||{8B382828-6202-11D1-8870-0000F87579D2}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:data\\Contact.java||{8B382828-6202-11D1-8870-0000F87579D2}" - } - ], - "DocumentGroupContainers": [ - { - "Orientation": 0, - "VerticalTabListWidth": 256, - "DocumentGroups": [ - { - "DockedWidth": 200, - "SelectedChildIndex": 0, - "Children": [ - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "Contact.java", - "DocumentMoniker": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java", - "RelativeDocumentMoniker": "data\\Contact.java", - "ToolTip": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java", - "RelativeToolTip": "data\\Contact.java", - "ViewState": "AgIAAAAAAAAAAAAAAAAAACYAAAAHAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", - "WhenOpened": "2024-12-30T08:30:43.773Z", - "IsPinned": true, - "EditorCaption": "" - }, - { - "$type": "Bookmark", - "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Src/app/src/main/java/net/micode/notes/.vs/slnx.sqlite b/Src/app/src/main/java/net/micode/notes/.vs/slnx.sqlite deleted file mode 100644 index d9d2d78..0000000 Binary files a/Src/app/src/main/java/net/micode/notes/.vs/slnx.sqlite and /dev/null differ diff --git a/Src/app/src/main/java/net/micode/notes/data/Notes.java b/Src/app/src/main/java/net/micode/notes/data/Notes.java index 3e85bfe..86dffc2 100644 --- a/Src/app/src/main/java/net/micode/notes/data/Notes.java +++ b/Src/app/src/main/java/net/micode/notes/data/Notes.java @@ -89,6 +89,10 @@ public class Notes { public static final String ORIGIN_PARENT_ID = "origin_parent_id"; // 原始父ID (类型: INTEGER) public static final String GTASK_ID = "gtask_id"; // Google任务ID (类型: TEXT) public static final String VERSION = "version"; // 版本号 (类型: INTEGER) + public static final String IMAGE_PATH = "image_path";// 新增列存储图片路径 + public static final String USER_ID = "user_id"; + public static final String AUDIO_PATH = "audio_path"; + public static final String GESTURE_PASSWORD = "gesture_password"; } // DataColumns接口：定义数据列 diff --git a/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index 5c6ce2b..becdd9b 100644 --- a/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -20,12 +20,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String DB_NAME = "note.db"; // 数据库版本号，用于判断数据库结构是否需要升级 - private static final int DB_VERSION = 4; + private static final int DB_VERSION = 9; // 表接口，定义了数据库中两个主要表的表名：NOTE和DATA public interface TABLE { public static final String NOTE = "note"; // 存储笔记信息 public static final String DATA = "data"; // 存储笔记内容的数据表 + public static final String USER = "user";//用户表 + String USERNAME_COLUMN = "username"; + String PASSWORD_COLUMN = "password"; } // 日志标签，用于输出调试信息 @@ -34,6 +37,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 单例模式，确保数据库辅助类的唯一实例 private static NotesDatabaseHelper mInstance; + // 创建用户表的SQL语句 + private static final String CREATE_USER_TABLE_SQL = + "CREATE TABLE " + TABLE.USER + " (" + + "id INTEGER PRIMARY KEY AUTOINCREMENT, " + + TABLE.USERNAME_COLUMN + " TEXT NOT NULL UNIQUE, " + + TABLE.PASSWORD_COLUMN + " TEXT NOT NULL" + + ")"; // SQL语句：创建NOTE表 private static final String CREATE_NOTE_TABLE_SQL = "CREATE TABLE " + TABLE.NOTE + "(" + @@ -47,13 +57,17 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + // 文件夹内笔记数量 NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + // 笔记摘要 NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + // 笔记类型 + NoteColumns.USER_ID + " INTEGER NOT NULL DEFAULT -1," + // 新增 user_id 字段 NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + // 小部件ID NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + // 小部件类型 NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + // 同步ID NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +// 本地是否已修改 NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +// 原始父ID NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + // Google任务ID - NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + // 笔记版本号 + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," + // 笔记版本号 + NoteColumns.IMAGE_PATH + " TEXT," + // 新增列存储图片路径 + NoteColumns.AUDIO_PATH + " TEXT," + //新增列存储音频路径 + NoteColumns.GESTURE_PASSWORD + " TEXT" + // 新增手势密码字段 ")"; // SQL语句：创建DATA表 @@ -333,7 +347,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { * @param context Context类型，应用上下文，用于初始化数据库 * @return NotesDatabaseHelper类型的单例对象 */ - static synchronized NotesDatabaseHelper getInstance(Context context) { + public static synchronized NotesDatabaseHelper getInstance(Context context) { // 检查是否已有实例 if (mInstance == null) { // 如果实例为空，则创建新的 NotesDatabaseHelper 实例 @@ -357,9 +371,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 调用createDataTable方法，创建DATA表，并配置相关触发器和索引 createDataTable(db); + createUserTable(db); // 创建用户表 } - + // 创建用户表的方法 + private void createUserTable(SQLiteDatabase db) { + db.execSQL(CREATE_USER_TABLE_SQL); + } /** * 升级数据库的方法。当检测到数据库版本号发生变化时，系统自动调用此方法，根据旧版本号逐步升级数据库结构。 * 此方法根据数据库的旧版本逐步调用不同版本的升级方法，并在必要时重新创建触发器。 @@ -370,38 +388,45 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { */ @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - boolean reCreateTriggers = false; // 标记是否需要重新创建触发器 - boolean skipV2 = false; // 标记是否需要跳过版本2的升级 - - // 检查并按顺序执行版本升级 - if (oldVersion == 1) { - upgradeToV2(db); // 从版本1升级到版本2 - skipV2 = true; // 跳过后续升级到版本2的操作 - oldVersion++; + // 确保按顺序执行每个版本的升级逻辑 + if (oldVersion < 2) { + upgradeToV2(db); // 从版本1升级到版本2 } - if (oldVersion == 2 && !skipV2) { - upgradeToV3(db); // 从版本2升级到版本3 - reCreateTriggers = true; // 设置标记为true，表示需要重新创建触发器 - oldVersion++; + if (oldVersion < 3) { + upgradeToV3(db); // 从版本2升级到版本3 } - if (oldVersion == 3) { - upgradeToV4(db); // 从版本3升级到版本4 - oldVersion++; + if (oldVersion < 4) { + upgradeToV4(db); // 从版本3升级到版本4 } - - // 如果升级过程中需要重新创建触发器，则调用方法重新创建NOTE表和DATA表的触发器 - if (reCreateTriggers) { - reCreateNoteTableTriggers(db); // 重新创建NOTE表的触发器 - reCreateDataTableTriggers(db); // 重新创建DATA表的触发器 + if (oldVersion < 5) { + // 在版本5中创建用户表 + createUserTable(db); // 确保调用创建用户表的方法 + } + if (oldVersion < 6) { // 增加照片路径新列 + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.IMAGE_PATH + " TEXT"); + } + if(oldVersion < 7){ + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN "+ NoteColumns.USER_ID + "INTEGER NOT NULL DEFAULT -1"); + } + if(oldVersion < 8){ + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN "+ NoteColumns.AUDIO_PATH + " TEXT"); + } + if(oldVersion < 9){ + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN "+ NoteColumns.GESTURE_PASSWORD + " TEXT"); } - // 检查是否所有升级已成功完成，如果未完成则抛出异常 - if (oldVersion != newVersion) { + // 如果需要，重新创建触发器 + reCreateNoteTableTriggers(db); // 重建NOTE表的触发器 + reCreateDataTableTriggers(db); // 重建DATA表的触发器 + + // 检查是否升级成功 + if (oldVersion >= newVersion) { throw new IllegalStateException("Upgrade notes database to version " + newVersion + " fails"); } } + /** * 从版本1升级到版本2的方法。此升级步骤删除旧表并重新创建NOTE表和DATA表， * 以确保结构更新并清除旧数据。 diff --git a/Src/app/src/main/java/net/micode/notes/data/UserDao.java b/Src/app/src/main/java/net/micode/notes/data/UserDao.java new file mode 100644 index 0000000..5a80353 --- /dev/null +++ b/Src/app/src/main/java/net/micode/notes/data/UserDao.java @@ -0,0 +1,83 @@ +package net.micode.notes.data; + +import android.content.ContentValues; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; +import android.util.Log; + +public class UserDao { + private NotesDatabaseHelper dbHelper; + + // 常量定义 + public static final String COLUMN_USERNAME = "username"; + public static final String COLUMN_PASSWORD = "password"; + + // UserDao的构造函数，传入NotesDatabaseHelper的实例 + public UserDao(NotesDatabaseHelper dbHelper) { + this.dbHelper = dbHelper; + } + + // 注册用户，并返回用户 ID + public long registerUser(String username, String password) { + SQLiteDatabase db = null; + try { + db = dbHelper.getWritableDatabase(); + ContentValues values = new ContentValues(); + values.put(COLUMN_USERNAME, username); + values.put(COLUMN_PASSWORD, password); + + long userId = db.insert(NotesDatabaseHelper.TABLE.USER, null, values); + + if (userId == -1) { + Log.d("UserDao", "注册失败，用户名：" + username); + } else { + Log.d("UserDao", "注册成功，用户ID：" + userId); + } + return userId; // 返回用户ID + } catch (Exception e) { + Log.e("UserDao", "注册用户时出错", e); + return -1; // 插入失败 + } finally { + if (db != null) { + db.close(); // 确保数据库关闭 + } + } + } + + // 登录用户，返回用户 ID，失败返回 -1 + public int loginUser(String username, String password) { + SQLiteDatabase db = dbHelper.getReadableDatabase(); + Cursor cursor = null; + try { + cursor = db.query(NotesDatabaseHelper.TABLE.USER, new String[]{"id"}, "username=? AND password=?", + new String[]{username, password}, null, null, null); + if (cursor != null && cursor.moveToFirst()) { + return cursor.getInt(0); // 返回用户ID + } + } finally { + if (cursor != null) { + cursor.close(); + } + } + return -1; // 登录失败 + } + + // 根据用户名获取用户 ID + public int getUserIdByUsername(String username) { + SQLiteDatabase db = dbHelper.getReadableDatabase(); + Cursor cursor = null; + try { + cursor = db.query(NotesDatabaseHelper.TABLE.USER, new String[]{"id"}, "username=?", + new String[]{username}, null, null, null); + if (cursor != null && cursor.moveToFirst()) { + return cursor.getInt(0); // 返回用户ID + } + } finally { + if (cursor != null) { + cursor.close(); + } + } + return -1; // 用户不存在 + } + +} \ No newline at end of file diff --git a/Src/app/src/main/java/net/micode/notes/login/LoginActivity.java b/Src/app/src/main/java/net/micode/notes/login/LoginActivity.java new file mode 100644 index 0000000..a0b4ecf --- /dev/null +++ b/Src/app/src/main/java/net/micode/notes/login/LoginActivity.java @@ -0,0 +1,91 @@ +package net.micode.notes.login; + +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; +import android.widget.Toast; +import android.app.Activity; + +import net.micode.notes.R; +import net.micode.notes.data.NotesDatabaseHelper; +import net.micode.notes.data.UserDao; +import net.micode.notes.ui.NotesListActivity; + +public class LoginActivity extends Activity { + + private EditText etLoginUsername; + private EditText etLoginPassword; + private Button btnLogin; + private Button btnRegister; + + private UserDao userDao; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_login); + + NotesDatabaseHelper dbHelper = NotesDatabaseHelper.getInstance(this); + userDao = new UserDao(dbHelper); + + etLoginUsername = (EditText) findViewById(R.id.etLoginUsername); + etLoginPassword = (EditText) findViewById(R.id.etLoginPassword); + btnLogin = (Button) findViewById(R.id.btnLogin); + btnRegister = (Button) findViewById(R.id.btnRegister); + + btnLogin.setOnClickListener(v -> attemptLogin()); + btnRegister.setOnClickListener(v -> navigateToRegister()); + } + + private void attemptLogin() { + String username = etLoginUsername.getText().toString().trim(); + String password = etLoginPassword.getText().toString().trim(); + + if (username.isEmpty() || password.isEmpty()) { + showToast("用户名或密码不能为空"); + return; + } + + int userId = userDao.loginUser(username, password); + Log.d("LoginActivity", "Login userId: " + userId); + if (userId != -1) { // 登录成功 + setCurrentUserId(userId); // 保存用户ID到SharedPreferences + + Intent intent = new Intent(LoginActivity.this, NotesListActivity.class); + startActivity(intent); + finish(); + } else { + showToast("错误的用户名或密码"); + } + } + + // 新增 setCurrentUserId 方法 + private void setCurrentUserId(int userId) { + Log.d("LoginActivity", "Saving userId to SharedPreferences: " + userId); + SharedPreferences.Editor editor = getSharedPreferences("user_session", MODE_PRIVATE).edit(); + editor.putInt("user_id", userId); // 保存当前用户ID + editor.apply(); + } + + private void navigateToRegister() { + Intent intent = new Intent(LoginActivity.this, RegisterActivity.class); + startActivity(intent); + } + private void showToast(String message) { + LayoutInflater inflater = getLayoutInflater(); + View layout = inflater.inflate(R.layout.layout_custom_toast, null); + TextView textView = (TextView) layout.findViewById(R.id.textView); + textView.setText(message); + + Toast toast = new Toast(getApplicationContext()); + toast.setDuration(Toast.LENGTH_SHORT); + toast.setView(layout); + toast.show(); + } +} diff --git a/Src/app/src/main/java/net/micode/notes/login/RegisterActivity.java b/Src/app/src/main/java/net/micode/notes/login/RegisterActivity.java new file mode 100644 index 0000000..a5abe3c --- /dev/null +++ b/Src/app/src/main/java/net/micode/notes/login/RegisterActivity.java @@ -0,0 +1,96 @@ +package net.micode.notes.login; + +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; +import android.widget.Toast; +import android.app.Activity; + +import net.micode.notes.R; +import net.micode.notes.data.NotesDatabaseHelper; +import net.micode.notes.data.UserDao; +import net.micode.notes.ui.NotesListActivity; + +public class RegisterActivity extends Activity { + + private EditText etUsername; + private EditText etPassword; + private Button btnRegister; + private Button btnBackToLogin; + + private UserDao userDao; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_register); + + NotesDatabaseHelper dbHelper = NotesDatabaseHelper.getInstance(this); + userDao = new UserDao(dbHelper); + + etUsername = (EditText) findViewById(R.id.etUsername); + etPassword = (EditText) findViewById(R.id.etPassword); + btnRegister = (Button) findViewById(R.id.btnRegister); + btnBackToLogin = (Button) findViewById(R.id.btnBackToLogin); + + btnRegister.setOnClickListener(v -> attemptRegister()); + btnBackToLogin.setOnClickListener(v -> navigateToLogin()); + } + + private void attemptRegister() { + String username = etUsername.getText().toString().trim(); + String password = etPassword.getText().toString().trim(); + + if (username.isEmpty() || password.isEmpty()) { + showToast("用户名或密码不能为空"); + return; + } + + long userId = userDao.registerUser(username, password); + if (userId != -1) { // 注册成功 + showToast("注册成功"); + setCurrentUserId((int) userId); // 保存用户ID到SharedPreferences + navigateToNotesList(); // 跳转到主界面 + } else { + showToast("注册失败，用户名可能已存在"); + } + } + + // 新增 setCurrentUserId 方法 + private void setCurrentUserId(int userId) { + SharedPreferences.Editor editor = getSharedPreferences("user_session", MODE_PRIVATE).edit(); + editor.putInt("user_id", userId); // 保存当前用户ID + editor.apply(); + } + + // 新增 navigateToNotesList 方法 + private void navigateToNotesList() { + Intent intent = new Intent(RegisterActivity.this, NotesListActivity.class); + startActivity(intent); + finish(); + } + + private void navigateToLogin() { + Intent intent = new Intent(RegisterActivity.this, LoginActivity.class); + startActivity(intent); + finish(); + } + + // 自定义Toast显示方法 + private void showToast(String message) { + LayoutInflater inflater = getLayoutInflater(); + View layout = inflater.inflate(R.layout.layout_custom_toast, null); + TextView textView = (TextView) layout.findViewById(R.id.textView); + textView.setText(message); + + Toast toast = new Toast(getApplicationContext()); + toast.setDuration(Toast.LENGTH_SHORT); + toast.setView(layout); + toast.show(); + } +} \ No newline at end of file diff --git a/Src/app/src/main/java/net/micode/notes/model/Note.java b/Src/app/src/main/java/net/micode/notes/model/Note.java index ceb150e..1a5f714 100644 --- a/Src/app/src/main/java/net/micode/notes/model/Note.java +++ b/Src/app/src/main/java/net/micode/notes/model/Note.java @@ -47,8 +47,7 @@ public class Note { * @param folderId 文件夹ID，表示新笔记将被添加到的文件夹 * @return 新创建的笔记的ID */ - public static synchronized long getNewNoteId(Context context, long folderId) { - // 在数据库中创建一个新的笔记 + public static synchronized long getNewNoteId(Context context, long folderId, int userId) { ContentValues values = new ContentValues(); long createdTime = System.currentTimeMillis(); values.put(NoteColumns.CREATED_DATE, createdTime); @@ -56,6 +55,10 @@ public class Note { values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); values.put(NoteColumns.LOCAL_MODIFIED, 1); values.put(NoteColumns.PARENT_ID, folderId); + values.put(NoteColumns.USER_ID, userId); // 设置 user_id + values.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); + + Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); long noteId = 0; @@ -68,6 +71,8 @@ public class Note { if (noteId == -1) { throw new IllegalStateException("错误的笔记ID:" + noteId); } + Log.d("Note", "Inserted note for user_id: " + userId + ", noteId: " + noteId); + return noteId; } diff --git a/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java b/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java index 02c31fb..c694eda 100644 --- a/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -17,9 +17,15 @@ package net.micode.notes.model; import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; import android.content.ContentUris; +import android.content.ContentValues; import android.content.Context; +import android.content.SharedPreferences; import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.net.Uri; import android.text.TextUtils; import android.util.Log; @@ -31,6 +37,13 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.Notes.TextNote; import net.micode.notes.tool.ResourceParser.NoteBgResources; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; + // WorkingNote类用于管理笔记的相关信息 public class WorkingNote { // 笔记对象，包含笔记的详细信息 @@ -165,9 +178,15 @@ public class WorkingNote { */ private void loadNote() { // 使用内容提供者查询数据库，获取与指定笔记ID匹配的笔记信息 + SharedPreferences prefs = mContext.getSharedPreferences("user_session", Context.MODE_PRIVATE); + int userId = prefs.getInt("user_id", -1); Cursor cursor = mContext.getContentResolver().query( - ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null, - null, null); + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), + NOTE_PROJECTION, + NoteColumns.USER_ID + "=?", + new String[]{String.valueOf(userId)}, + null + ); if (cursor != null) { // 如果查询结果不为空，尝试读取数据 @@ -287,10 +306,21 @@ public class WorkingNote { if (isWorthSaving()) { // 检查笔记是否已存在于数据库中 if (!existInDatabase()) { - // 如果笔记不在数据库中，为该笔记生成一个新的ID - if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) { + // 获取当前登录用户的 user_id + SharedPreferences prefs = mContext.getSharedPreferences("user_session", Context.MODE_PRIVATE); + + int userId = prefs.getInt("user_id", -1); // -1 表示未登录 + Log.d("WorkingNote", "Saving note with userId: " + userId); + + if (userId == -1) { + Log.e(TAG, "无法保存笔记，因为用户未登录"); + return false; // 未登录时不保存 + } + + // 如果笔记不在数据库中，为该笔记生成一个新的ID，并关联 user_id + if ((mNoteId = Note.getNewNoteId(mContext, mFolderId, userId)) == 0) { // 若生成新ID失败，记录日志并返回 false 表示保存失败 - Log.e(TAG, "Create new note fail with id:" + mNoteId); + Log.e(TAG, "创建新便签失败:" + mNoteId); return false; } } @@ -312,6 +342,7 @@ public class WorkingNote { } + /** * 检查笔记是否已存在于数据库中。 * @@ -626,4 +657,109 @@ public class WorkingNote { void onCheckListModeChanged(int oldMode, int newMode); } + public String saveImageToFileSystem(Uri imageUri, String fileName) { + InputStream inputStream = null; + FileOutputStream outputStream = null; + try { + inputStream = mContext.getContentResolver().openInputStream(imageUri); + String imageFilePath = mContext.getExternalFilesDir(null).getAbsoluteFile() + "/" + fileName; + + outputStream = new FileOutputStream(imageFilePath); + byte[] buffer = new byte[4096]; + int bytesRead; + while ((bytesRead = inputStream.read(buffer)) != -1) { + outputStream.write(buffer, 0, bytesRead); + } + return imageFilePath; + } catch (IOException e) { + Log.e(TAG, "Error saving image to filesystem", e); + return null; + } finally { + try { + if (inputStream != null) inputStream.close(); + if (outputStream != null) outputStream.close(); + } catch (IOException e) { + Log.e(TAG, "Error closing streams", e); + } + } + } + + + /** + * 将图片路径保存到数据库。 + * + * @param imagePath 图片的文件路径。 + */ + public void saveImagePathToDatabase(String imagePath) { + ContentValues values = new ContentValues(); + values.put(NoteColumns.IMAGE_PATH, imagePath); + + // 更新数据库中的图片路径 + ContentResolver contentResolver = mContext.getContentResolver(); + Uri noteUri = ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId); + contentResolver.update(noteUri, values, null, null); + } + + /** + * 从数据库获取图片路径。 + * + * @return 图片的文件路径。 + */ + public String getImagePathFromDatabase() { + Cursor cursor = mContext.getContentResolver().query( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), + new String[]{NoteColumns.IMAGE_PATH}, null, null, null); + + if (cursor != null && cursor.moveToFirst()) { + String imagePath = cursor.getString(cursor.getColumnIndex(NoteColumns.IMAGE_PATH)); + cursor.close(); + return imagePath; + } + return null; + } + public Bitmap loadImageFromFile(String imagePath) { + File imgFile = new File(imagePath); + if (imgFile.exists()) { + return BitmapFactory.decodeFile(imgFile.getAbsolutePath()); + } + return null; + } + // 获取音频路径 + public String getAudioPathFromDatabase() { + Cursor cursor = mContext.getContentResolver().query( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), + new String[]{NoteColumns.AUDIO_PATH}, null, null, null); + + if (cursor != null) { + if (cursor.moveToFirst()) { + String audioPath = cursor.getString(0); + cursor.close(); + return audioPath; + } + cursor.close(); + } + return null; + } + + // 保存音频路径到数据库 + public void saveAudioPathToDatabase(String audioPath) { + ContentValues values = new ContentValues(); + values.put(NoteColumns.AUDIO_PATH, audioPath); + mContext.getContentResolver().update( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), values, null, null); + } + private String mGesturePassword; + + public String getGesturePassword() { + return mGesturePassword; + } + + public void setGesturePassword(String gesturePassword) { + if (!TextUtils.equals(mGesturePassword, gesturePassword)) { + mGesturePassword = gesturePassword; + mNote.setNoteValue(NoteColumns.GESTURE_PASSWORD, mGesturePassword); + } + } + } + diff --git a/Src/app/src/main/java/net/micode/notes/ui/LockPatternView.java b/Src/app/src/main/java/net/micode/notes/ui/LockPatternView.java new file mode 100644 index 0000000..3a9be36 --- /dev/null +++ b/Src/app/src/main/java/net/micode/notes/ui/LockPatternView.java @@ -0,0 +1,264 @@ +package net.micode.notes.ui; + +import android.animation.ValueAnimator; +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Path; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.view.View; +import android.view.animation.DecelerateInterpolator; + +import net.micode.notes.R; + +import java.util.ArrayList; +import java.util.List; + +public class LockPatternView extends View { + private static final String TAG = "LockPatternView"; + private Paint pointPaint; + private Paint linePaint; + private Paint highlightPaint; + private int normalColor; + private int selectedColor; + private int errorColor; + private float pointRadius; + private float pointInnerRadius; + private boolean isError = false; + private ValueAnimator pointAnimator; + private Point[][] points = new Point[3][3]; + private List selectedPoints = new ArrayList<>(); + private boolean isDrawing = false; + private float currentX, currentY; + private OnPatternListener patternListener; + + public interface OnPatternListener { + void onPatternComplete(String pattern); + } + + public LockPatternView(Context context, AttributeSet attrs) { + super(context, attrs); + init(); + } + + private void init() { + setLayerType(LAYER_TYPE_SOFTWARE, null); + + // 获取颜色资源 + normalColor = getResources().getColor(R.color.gesture_point_normal); + selectedColor = getResources().getColor(R.color.gesture_point_selected); + errorColor = getResources().getColor(R.color.gesture_point_error); + + // 初始化画笔 + pointPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + pointPaint.setStyle(Paint.Style.STROKE); + pointPaint.setStrokeWidth(dpToPx(3)); + + linePaint = new Paint(Paint.ANTI_ALIAS_FLAG); + linePaint.setStyle(Paint.Style.STROKE); + linePaint.setStrokeWidth(dpToPx(3)); + linePaint.setStrokeCap(Paint.Cap.ROUND); + + highlightPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + highlightPaint.setStyle(Paint.Style.FILL); + + // 初始化动画 + setupAnimator(); + } + + private void setupAnimator() { + pointAnimator = ValueAnimator.ofFloat(0f, 1f); + pointAnimator.setDuration(300); + pointAnimator.setInterpolator(new DecelerateInterpolator()); + pointAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + float value = (float) animation.getAnimatedValue(); + pointInnerRadius = pointRadius * 0.3f + (pointRadius * 0.7f * value); + invalidate(); + } + }); + } + + private float dpToPx(float dp) { + return dp * getContext().getResources().getDisplayMetrics().density; + } + + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + float size = Math.min(w, h); + pointRadius = size / 12; // 点的大小 + pointInnerRadius = pointRadius * 0.3f; + + // 修正计算逻辑 + float padding = size / 6; // 边距 + float cellWidth = (size - (padding * 2)) / 2; // 这里导致了问题 + + // 修改为3x3网格的计算方式 + float cellSize = (size - (padding * 2)) / 3; // 每个格子的大小 + + // 计算9个点的位置 + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + float x = padding + j * cellSize + (cellSize / 2); // 加上半个格子大小使点居中 + float y = padding + i * cellSize + (cellSize / 2); + points[i][j] = new Point(x, y); + } + } + } + + @Override + protected void onDraw(Canvas canvas) { + // 绘制连线 + if (selectedPoints.size() > 0) { + linePaint.setColor(isError ? errorColor : selectedColor); + Path path = new Path(); + Point first = selectedPoints.get(0); + path.moveTo(first.x, first.y); + + for (int i = 1; i < selectedPoints.size(); i++) { + Point point = selectedPoints.get(i); + path.lineTo(point.x, point.y); + } + + if (isDrawing) { + path.lineTo(currentX, currentY); + } + + canvas.drawPath(path, linePaint); + } + + // 绘制所有点 + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + Point point = points[i][j]; + boolean isSelected = selectedPoints.contains(point); + + // 绘制外圈 + pointPaint.setColor(isSelected ? + (isError ? errorColor : selectedColor) : normalColor); + canvas.drawCircle(point.x, point.y, pointRadius, pointPaint); + + // 绘制内圈 + if (isSelected) { + highlightPaint.setColor(isSelected ? + (isError ? errorColor : selectedColor) : normalColor); + canvas.drawCircle(point.x, point.y, pointInnerRadius, highlightPaint); + } + } + } + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + if (!isEnabled()) { + return false; + } + + currentX = event.getX(); + currentY = event.getY(); + + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + isDrawing = true; + selectedPoints.clear(); + checkPoint(currentX, currentY); + invalidate(); + return true; + + case MotionEvent.ACTION_MOVE: + if (isDrawing) { + checkPoint(currentX, currentY); + invalidate(); + } + return true; + + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_CANCEL: + if (isDrawing) { + isDrawing = false; + if (patternListener != null && selectedPoints.size() > 0) { + patternListener.onPatternComplete(getPatternString()); + } + invalidate(); + } + return true; + } + return false; + } + + private void checkPoint(float x, float y) { + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + Point point = points[i][j]; + float dx = x - point.x; + float dy = y - point.y; + float distance = (float) Math.sqrt(dx * dx + dy * dy); + + if (distance < pointRadius && !selectedPoints.contains(point)) { + selectedPoints.add(point); + } + } + } + } + + private String getPatternString() { + StringBuilder sb = new StringBuilder(); + for (Point point : selectedPoints) { + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + if (points[i][j] == point) { + sb.append(i * 3 + j); + } + } + } + } + return sb.toString(); + } + + public void showError() { + isError = true; + pointAnimator.start(); + postDelayed(new Runnable() { + @Override + public void run() { + isError = false; + clearPattern(); + } + }, 1000); + } + public void showSuccess() { + selectedColor = getResources().getColor(R.color.gesture_success_color); + invalidate(); + } + + + public void clearPattern() { + isError = false; + selectedPoints.clear(); + invalidate(); + } + + public void setPatternListener(OnPatternListener listener) { + this.patternListener = listener; + } + + private static class Point { + float x, y; + Point(float x, float y) { + this.x = x; + this.y = y; + } + } + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + + int width = getMeasuredWidth(); + // 确保是正方形 + setMeasuredDimension(width, width); + } +} \ No newline at end of file diff --git a/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 6f10435..c091a75 100644 --- a/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -16,12 +16,14 @@ package net.micode.notes.ui; +import android.Manifest; import android.app.Activity; import android.app.AlarmManager; import android.app.AlertDialog; import android.app.PendingIntent; import android.app.SearchManager; import android.appwidget.AppWidgetManager; +import android.content.ActivityNotFoundException; import android.content.ContentResolver; import android.content.ContentUris; import android.content.ContentValues; @@ -29,22 +31,31 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.content.res.AssetManager; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Paint; + + +import android.media.MediaPlayer; +import android.media.MediaRecorder; import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.DocumentsContract; import android.provider.MediaStore; +import android.speech.RecognizerIntent; import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.format.DateUtils; +import android.text.method.LinkMovementMethod; import android.text.style.BackgroundColorSpan; +import android.text.style.ClickableSpan; import android.text.style.ImageSpan; import android.util.Log; import android.view.LayoutInflater; @@ -77,9 +88,22 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; +import org.json.JSONObject; +import org.vosk.Model; +import org.vosk.Recognizer; +import org.vosk.android.RecognitionListener; +import org.vosk.android.SpeechService; + +import java.io.File; import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.Locale; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -96,7 +120,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, public TextView tvAlertDate; // 显示提醒日期的文本视图 public ImageView ibSetBgColor; // 设置背景颜色的图像视图 } - + private static final int REQUEST_SET_PATTERN = 1001; + private static final int REQUEST_VERIFY_PATTERN = 1002; /** * 背景选择按钮与其对应选中状态图标的映射。 */ @@ -195,18 +220,27 @@ public class NoteEditActivity extends Activity implements OnClickListener, // } // initResources(); // 初始化资源 // } -private final int PHOTO_REQUEST=1; - + private final int PHOTO_REQUEST=1; + private Model model; + private SpeechService speechService; @Override - protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + System.setProperty("jna.nosys", "true"); + System.setProperty("jna.boot.library.path", getApplicationInfo().nativeLibraryDir); + Log.d("Vosk", "Native library path: " + getApplicationInfo().nativeLibraryDir); + this.setContentView(R.layout.note_edit); if (savedInstanceState == null && !initActivityState(getIntent())) { finish(); return; } + // 获取便签ID + long noteId = getIntent().getLongExtra("note_id", 0); + + // 检查密码 + checkNotePassword(noteId); initResources(); //根据id获取添加图片按钮 @@ -225,7 +259,86 @@ private final int PHOTO_REQUEST=1; startActivityForResult(loadImage, PHOTO_REQUEST); } }); + // 根据id获取录音按钮 + final ImageButton record_audio_btn = (ImageButton) findViewById(R.id.record_audio_btn); + record_audio_btn.setOnClickListener(new View.OnClickListener() { + private boolean isRecording = false; + + @Override + public void onClick(View v) { + if (!isRecording) { + startRecordingAudio(); + isRecording = true; + record_audio_btn.setImageResource(android.R.drawable.ic_media_pause); // 切换为暂停图标 + } else { + stopRecordingAudio(); + isRecording = false; + record_audio_btn.setImageResource(android.R.drawable.ic_btn_speak_now); // 切换为录音图标 + } + } + }); + // 加载模型 + new Thread(() -> { + try { + File modelDir = new File(getFilesDir(), "vosk-model-small-cn-0.22"); + + // 检查模型文件是否完整 + if (!modelDir.exists() || !new File(modelDir, "ivector").exists()) { + Log.e("ModelCheck", "模型文件不完整，开始复制模型文件..."); + copyAssetsFolder("vosk-model-small-cn-0.22", modelDir); + } + + Log.d("Vosk", "开始加载模型..."); + model = new Model(modelDir.getAbsolutePath()); + Log.d("Vosk", "模型加载成功"); + } catch (IOException e) { + e.printStackTrace(); + Log.e("Vosk", "模型加载失败：" + e.getMessage()); + } + }).start(); + + + // 根据id获取语音转文字按钮 + final ImageButton speech_to_text_btn = (ImageButton) findViewById(R.id.speech_to_text_btn); + speech_to_text_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startSpeechToText(); + } + }); } + + private void copyAssetsFolder(String assetDir, File outDir) throws IOException { + AssetManager assetManager = getAssets(); + String[] files = assetManager.list(assetDir); + if (files != null && files.length > 0) { + // 如果目标目录不存在，则创建 + if (!outDir.exists()) { + outDir.mkdirs(); + } + for (String file : files) { + String assetPath = assetDir + "/" + file; + File outFile = new File(outDir, file); + // 如果是文件夹，递归调用 + if (assetManager.list(assetPath).length > 0) { + copyAssetsFolder(assetPath, outFile); + } else { + // 复制文件 + try (InputStream in = assetManager.open(assetPath); + OutputStream out = new FileOutputStream(outFile)) { + byte[] buffer = new byte[1024]; + int read; + while ((read = in.read(buffer)) != -1) { + out.write(buffer, 0, read); + } + } + } + } + } + } + + + /** * 当活动被系统销毁后，为了恢复之前的状态，此方法会被调用。 * 主要用于处理活动重新创建时的数据恢复。 @@ -351,9 +464,66 @@ private final int PHOTO_REQUEST=1; @Override protected void onResume() { super.onResume(); + // 避免重复验证 + if (!isPatternVerified()) { + checkNotePassword(mWorkingNote.getNoteId()); + } + + // 初始化笔记界面 initNoteScreen(); + + // 获取图片路径并插入图片 + String imagePath = mWorkingNote.getImagePathFromDatabase(); + String audioPath = mWorkingNote.getAudioPathFromDatabase(); + if (imagePath != null) { + // 从文件加载图像 + Bitmap bitmap = mWorkingNote.loadImageFromFile(imagePath); + if (bitmap != null) { + // 创建一个 ImageSpan + ImageSpan imageSpan = new ImageSpan(this, bitmap); + SpannableString spannableString = new SpannableString(" "); // 使用占位符 + spannableString.setSpan(imageSpan, 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + + // 找到笔记编辑器并插入图片 + NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); + int index = noteEditText.getSelectionStart(); // 获取光标位置 + noteEditText.getEditableText().insert(index, spannableString); + } else { + Log.e(TAG, "Failed to load image from file: " + imagePath); + } + } + else { + Log.e(TAG, "Image path is null. Can't load image."); + } } + private MediaPlayer mediaPlayer; + private void playAudio(String path) { + if (mediaPlayer != null) { + mediaPlayer.release(); // 释放之前的实例 + mediaPlayer = null; + } + mediaPlayer = new MediaPlayer(); + try { + mediaPlayer.setDataSource(path); // 设置音频路径 + mediaPlayer.prepare(); // 准备播放 + mediaPlayer.start(); // 开始播放 + + // 设置播放完成的回调 + mediaPlayer.setOnCompletionListener(mp -> { + mp.release(); // 播放完成时释放资源 + mediaPlayer = null; + }); + } catch (IOException e) { + e.printStackTrace(); + Toast.makeText(this, "Unable to play audio", Toast.LENGTH_SHORT).show(); + } + } + private boolean isPatternVerified = false; + + private boolean isPatternVerified() { + return isPatternVerified; + } /** * 初始化笔记界面的函数。 * 该函数设置笔记编辑器的外观，根据笔记类型切换到相应的模式，设置背景和头部信息， @@ -386,7 +556,6 @@ private final int PHOTO_REQUEST=1; // 显示提醒头部信息（当前禁用，因DateTimePicker未准备好） showAlertHeader(); - convertToImage();//导入的图片变成路径 } /** @@ -415,45 +584,7 @@ private final int PHOTO_REQUEST=1; } } - private void convertToImage() { - NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit - Editable editable = noteEditText.getText();//1.获取text - String noteText = editable.toString(); //2.将note内容转换为字符串 - int length = editable.length(); //内容的长度 - //3.截取img片段 [local]+uri+[local]，提取uri - for(int i = 0; i < length; i++) { - for(int j = i; j < length; j++) { - String img_fragment = noteText.substring(i, j+1); //img_fragment：关于图片路径的片段 - if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){ - int limit = 7; //[local]为7个字符 - //[local][/local]共15个字符，剩下的为真正的path长度 - int len = img_fragment.length()-15; - //从[local]之后的len个字符就是path - String path = img_fragment.substring(limit,limit+len);//获取到了图片路径 - Bitmap bitmap = null; - Log.d(TAG, "图片的路径是："+path); - try { - bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式 - } catch (Exception e) { - e.printStackTrace(); - } - if(bitmap!=null){ //若图片存在 - Log.d(TAG, "图片不为null"); - ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); - //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 - String ss = "[local]" + path + "[/local]"; - SpannableString spannableString = new SpannableString(ss); - //5.将指定的标记对象附加到文本的开始...结束范围 - spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - Log.d(TAG, "Create spannable string success!"); - Editable edit_text = noteEditText.getEditableText(); - edit_text.delete(i,i+len+15); //6.删掉图片路径的文字 - edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片 - } - } - } - } - } + /** * 当Activity接收到新的Intent时调用。 * 用于根据新的Intent重新初始化Activity状态。 @@ -787,6 +918,11 @@ private final int PHOTO_REQUEST=1; // 删除提醒设置 mWorkingNote.setAlertDate(0, false); break; + case R.id.menu_set_gesture: + Intent intent = new Intent(this, NoteGesturePasswordActivity.class); + intent.putExtra("note_id", mWorkingNote.getNoteId()); + startActivityForResult(intent, REQUEST_SET_PATTERN); + return true; default: break; } @@ -1108,7 +1244,6 @@ private final int PHOTO_REQUEST=1; mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mEditTextList.setVisibility(View.GONE); mNoteEditor.setVisibility(View.VISIBLE); - convertToImage();//导入的图片变成路径 } } @@ -1304,61 +1439,278 @@ private final int PHOTO_REQUEST=1; // public boolean isDownloadsDocument(Uri uri) { // return "com.android.providers.downloads.documents".equals(uri.getAuthority()); // } - + private static final int REQUEST_RECORD_AUDIO = 101; + private static final int REQUEST_SPEECH_INPUT = 102; + private String audioFilePath; //是否为媒体文件 public boolean isMediaDocument(Uri uri) { return "com.android.providers.media.documents".equals(uri.getAuthority()); } + @Override protected void onActivityResult(int requestCode, int resultCode, Intent intent) { super.onActivityResult(requestCode, resultCode, intent); - ContentResolver resolver = getContentResolver(); - switch (requestCode) { - case PHOTO_REQUEST: - Uri originalUri = intent.getData(); //1.获得图片的真实路径 - Bitmap bitmap = null; - try { - bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片 - } catch (FileNotFoundException e) { - Log.d(TAG, "onActivityResult: get file_exception"); - e.printStackTrace(); + + // 检查请求代码和结果代码 + if (requestCode == PHOTO_REQUEST && resultCode == RESULT_OK && intent != null) { + Uri selectedImageUri = intent.getData(); // 获取选中的图片URI + if (selectedImageUri != null) { + // 获取图片文件的扩展名 + String fileExtension = getFileExtension(selectedImageUri); + String imageFileName = "image_" + System.currentTimeMillis() + fileExtension; // 生成图片文件名 + + // 保存图片到文件系统并获取路径 + String imageFilePath = mWorkingNote.saveImageToFileSystem(selectedImageUri, imageFileName); + + if (imageFilePath != null) { + // 保存图片路径到数据库 + mWorkingNote.saveImagePathToDatabase(imageFilePath); + // 更新UI，显示图片 + updateNoteViewWithImage(imageFilePath); + Log.d(TAG, "Image inserted successfully: " + imageFilePath); // 输出成功日志 + } else { + Log.e(TAG, "Failed to save image to file system."); // 输出错误日志 + Toast.makeText(this, "Failed to save the image.", Toast.LENGTH_SHORT).show(); } + } else { + Log.e(TAG, "Selected image URI is null."); // 输出错误日志 + Toast.makeText(this, "No image selected.", Toast.LENGTH_SHORT).show(); + } + } // 音频录制处理逻辑 + else if (requestCode == REQUEST_RECORD_AUDIO && resultCode == RESULT_OK && intent != null) { + Uri audioUri = intent.getData(); + if (audioUri != null) { + String audioPath = getRealPathFromURI(audioUri); + mWorkingNote.saveAudioPathToDatabase(audioPath); + Toast.makeText(this, "Audio recorded successfully!", Toast.LENGTH_SHORT).show(); + Log.d(TAG, "Audio inserted successfully: " + audioPath); + } else { + Log.e(TAG, "Recorded audio URI is null."); + Toast.makeText(this, "Failed to record audio.", Toast.LENGTH_SHORT).show(); + } + } + // 语音转文字处理逻辑 + else if (requestCode == REQUEST_SPEECH_INPUT && resultCode == RESULT_OK && intent != null) { + ArrayList result = intent.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS); + if (result != null && !result.isEmpty()) { + String spokenText = result.get(0); + mNoteEditor.append(spokenText); + Toast.makeText(this, "Speech converted to text!", Toast.LENGTH_SHORT).show(); + Log.d(TAG, "Speech to text: " + spokenText); + } else { + Log.e(TAG, "Speech recognition result is null."); + Toast.makeText(this, "No speech recognized.", Toast.LENGTH_SHORT).show(); + } + } else { + Log.e(TAG, "Activity result error, requestCode: " + requestCode + ", resultCode: " + resultCode); + } + if (requestCode == REQUEST_VERIFY_PATTERN) { + // 不要将 RESULT_OK (-1) 视为错误 + if (resultCode == RESULT_OK) { + isPatternVerified = true; + Log.d(TAG, "Pattern verification successful"); + // 继续正常操作 + return; + } else { + Log.d(TAG, "Pattern verification failed"); + finish(); + return; + } + } - if (bitmap != null) { - //3.根据Bitmap对象创建ImageSpan对象 - Log.d(TAG, "onActivityResult: bitmap is not null"); - ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); - String path = getPath(this, originalUri); - //4.使用[local][/local]将path括起来，用于之后方便识别图片路径在note中的位置 - String img_fragment = "[local]" + path + "[/local]"; - //创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 - SpannableString spannableString = new SpannableString(img_fragment); - spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - //5.将选择的图片追加到EditText中光标所在位置 - NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view); - int index = e.getSelectionStart(); //获取光标所在位置 - Log.d(TAG, "Index是: " + index); - Editable edit_text = e.getEditableText(); - edit_text.insert(index, spannableString); //将图片插入到光标所在位置 - - mWorkingNote.mContent = e.getText().toString(); - //6.把改动提交到数据库中,两个数据库表都要改的 - ContentResolver contentResolver = getContentResolver(); - ContentValues contentValues = new ContentValues(); - final long id = mWorkingNote.getNoteId(); - contentValues.put("snippet", mWorkingNote.mContent); - contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues, "_id=?", new String[]{"" + id}); - ContentValues contentValues1 = new ContentValues(); - contentValues1.put("content", mWorkingNote.mContent); - contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1, "mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note", "" + id}); + // 处理其他 Activity 结果 + try { + super.onActivityResult(requestCode, resultCode, intent); + } catch (Exception e) { + Log.e(TAG, "Error in super.onActivityResult", e); + } - } else { - Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show(); + } + + + // 获取图片文件的扩展名 + private String getFileExtension(Uri uri) { + String mimeType = getContentResolver().getType(uri); + if (mimeType == null) return ".jpg"; // 默认使用jpg格式 + + String extension = mimeType.split("/")[1]; + if (extension.equals("jpeg")) return ".jpg"; + if (extension.equals("png")) return ".png"; + if (extension.equals("gif")) return ".gif"; + // 可以添加更多的图片格式 + return "." + extension; + } + + + private void updateNoteViewWithImage(String imagePath) { + Bitmap bitmap = BitmapFactory.decodeFile(imagePath); + ImageSpan imageSpan = new ImageSpan(this, bitmap); + SpannableString spannableString = new SpannableString(" "); // 使用空格作为占位符 + spannableString.setSpan(imageSpan, 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + + // 将图片插入到EditText中 + NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); + int index = noteEditText.getSelectionStart(); // 获取光标所在位置 + noteEditText.getEditableText().insert(index, spannableString); + } + + + private MediaRecorder mediaRecorder; + + private void startRecordingAudio() { + try { + audioFilePath = getExternalFilesDir(null).getAbsolutePath() + "/audio_" + System.currentTimeMillis() + ".3gp"; + + mediaRecorder = new MediaRecorder(); + mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC); + mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP); + mediaRecorder.setOutputFile(audioFilePath); + mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB); + + mediaRecorder.prepare(); + mediaRecorder.start(); + + Toast.makeText(this, "Recording started...", Toast.LENGTH_SHORT).show(); + } catch (IOException e) { + e.printStackTrace(); + Toast.makeText(this, "Recording failed!", Toast.LENGTH_SHORT).show(); + } + } + + private void stopRecordingAudio() { + if (mediaRecorder != null) { + mediaRecorder.stop(); + mediaRecorder.release(); + mediaRecorder = null; + + // 获取音频路径 + String audioPath = audioFilePath; + + // 插入到光标位置 + NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); + int cursorPosition = noteEditText.getSelectionStart(); // 获取光标位置 + SpannableString spannableString = new SpannableString("[Audio]"); + spannableString.setSpan(new ImageSpan(this, R.drawable.ic_audio), 0, 7, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + + // 添加播放功能 + spannableString.setSpan(new ClickableSpan() { + @Override + public void onClick(View widget) { + Log.d("AudioClick", "Audio icon clicked"); + playAudio(audioPath); // 播放音频 } - break; - default: - break; + }, 0, 7, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + + Editable editable = noteEditText.getEditableText(); + editable.insert(cursorPosition, spannableString); // 插入到光标位置 + + // 保存音频路径到数据库 + mWorkingNote.saveAudioPathToDatabase(audioPath); + mWorkingNote.saveNote(); + // 确保编辑器启用点击事件 + noteEditText.setMovementMethod(LinkMovementMethod.getInstance()); + } + } + + + private String getRealPathFromURI(Uri contentUri) { + Cursor cursor = getContentResolver().query(contentUri, null, null, null, null); + if (cursor == null) return contentUri.getPath(); + cursor.moveToFirst(); + int idx = cursor.getColumnIndex(MediaStore.Audio.AudioColumns.DATA); + String path = cursor.getString(idx); + cursor.close(); + return path; + } + + private void startSpeechToText() { + if (speechService != null) { + speechService.stop(); // 停止之前的语音服务 + speechService = null; + } else { + try { + Recognizer recognizer = new Recognizer(model, 16000.0f); // 确认模型加载成功 + speechService = new SpeechService(recognizer, 16000.0f); // 初始化服务 + Log.d("SpeechService", "Recognizer started"); + speechService.startListening(new RecognitionListener() { + @Override + public void onPartialResult(String hypothesis) { + } + + @Override + public void onResult(String hypothesis) { + Log.d("SpeechService", "Final result: " + hypothesis); + // 识别完成时，插入文本到光标位置 + runOnUiThread(() -> { + try { + JSONObject json = new JSONObject(hypothesis); + String text = json.optString("text"); + + // 获取光标位置并插入文本 + int cursorPosition = mNoteEditor.getSelectionStart(); + Editable editableText = mNoteEditor.getText(); + editableText.insert(cursorPosition, text + " "); // 插入文字到光标处 + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + @Override + public void onFinalResult(String hypothesis) { + // 停止服务 + speechService = null; + } + + @Override + public void onError(Exception e) { + e.printStackTrace(); + runOnUiThread(() -> Toast.makeText(NoteEditActivity.this, "Recognition error", Toast.LENGTH_SHORT).show()); + } + + @Override + public void onTimeout() { + speechService = null; + } + }); + } catch (IOException e) { + e.printStackTrace(); + Toast.makeText(this, "Failed to start recognition", Toast.LENGTH_SHORT).show(); + } + } + } + private void checkNotePassword(long noteId) { + // 如果是新建便签，不需要验证密码 + if (noteId == 0 || noteId == -1) { + return; + } + + // 查询便签是否设置了密码 + Cursor cursor = null; + try { + cursor = getContentResolver().query( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), + new String[] { Notes.NoteColumns.GESTURE_PASSWORD }, + null, null, null); + + if (cursor != null && cursor.moveToFirst()) { + String password = cursor.getString(0); + // 只有设置了密码的便签才需要验证 + if (password != null && !password.isEmpty()) { + Intent intent = new Intent(this, NoteGestureVerifyActivity.class); + intent.putExtra("note_id", noteId); + startActivityForResult(intent, REQUEST_VERIFY_PATTERN); + } + } + } catch (Exception e) { + Log.e(TAG, "Error checking note password", e); + } finally { + if (cursor != null) { + cursor.close(); + } } } - // } + + + diff --git a/Src/app/src/main/java/net/micode/notes/ui/NoteGesturePasswordActivity.java b/Src/app/src/main/java/net/micode/notes/ui/NoteGesturePasswordActivity.java new file mode 100644 index 0000000..6fedba5 --- /dev/null +++ b/Src/app/src/main/java/net/micode/notes/ui/NoteGesturePasswordActivity.java @@ -0,0 +1,98 @@ +package net.micode.notes.ui; + +import android.app.Activity; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Intent; +import android.os.Bundle; +import android.widget.Button; +import android.widget.TextView; +import android.widget.Toast; + +import net.micode.notes.R; +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.NoteColumns; + +public class NoteGesturePasswordActivity extends Activity { + private LockPatternView lockPatternView; + private TextView gestureStatus; + private Button btnConfirm; + private String tempPattern; + private long noteId; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.note_gesture_password); + + noteId = getIntent().getLongExtra("note_id", -1); + if (noteId == -1) { + finish(); + return; + } + + initViews(); + } + + private void initViews() { + lockPatternView = (LockPatternView) findViewById(R.id.lock_pattern_view); + gestureStatus = (TextView) findViewById(R.id.gesture_status); + btnConfirm = (Button) findViewById(R.id.btn_confirm); + btnConfirm.setEnabled(false); + + // 修改这部分代码，使用新的接口 + lockPatternView.setPatternListener(new LockPatternView.OnPatternListener() { + @Override + public void onPatternComplete(String pattern) { + if (pattern.length() < 4) { + gestureStatus.setText(R.string.gesture_too_short); + return; + } + + if (tempPattern == null) { + tempPattern = pattern; + gestureStatus.setText(R.string.confirm_gesture_pattern); + btnConfirm.setEnabled(false); + } else { + if (tempPattern.equals(pattern)) { + btnConfirm.setEnabled(true); + gestureStatus.setText(R.string.gesture_matched); + } else { + tempPattern = null; + gestureStatus.setText(R.string.gesture_not_matched); + btnConfirm.setEnabled(false); + } + } + } + }); + + btnConfirm.setOnClickListener(v -> { + if (tempPattern != null) { + saveGesturePassword(tempPattern); + Toast.makeText(this, R.string.gesture_password_set, Toast.LENGTH_SHORT).show(); + setResult(RESULT_OK); + finish(); + } + }); + } + + private void saveGesturePassword(String pattern) { + ContentValues values = new ContentValues(); + values.put(NoteColumns.GESTURE_PASSWORD, pattern); + getContentResolver().update( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), + values, null, null); + + // 添加返回密码到结果Intent + Intent resultIntent = new Intent(); + resultIntent.putExtra("pattern", pattern); + setResult(RESULT_OK, resultIntent); + finish(); + } + + @Override + public void onBackPressed() { + setResult(RESULT_CANCELED); + super.onBackPressed(); + } +} \ No newline at end of file diff --git a/Src/app/src/main/java/net/micode/notes/ui/NoteGestureVerifyActivity.java b/Src/app/src/main/java/net/micode/notes/ui/NoteGestureVerifyActivity.java new file mode 100644 index 0000000..c7e4758 --- /dev/null +++ b/Src/app/src/main/java/net/micode/notes/ui/NoteGestureVerifyActivity.java @@ -0,0 +1,231 @@ +package net.micode.notes.ui; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.app.AlertDialog; +import android.content.ContentUris; +import android.content.Intent; +import android.content.res.ColorStateList; +import android.database.Cursor; +import android.os.Bundle; +import android.os.Handler; +import android.util.Log; +import android.view.WindowManager; +import android.widget.ImageView; +import android.widget.TextView; +import android.widget.Toast; + +import net.micode.notes.R; +import net.micode.notes.data.Notes; + +public class NoteGestureVerifyActivity extends Activity { + private static final String TAG = "NoteGestureVerifyActivity"; + private static final int MAX_TRIES = 5; + + private LockPatternView lockPatternView; + private TextView gestureStatus; + private ImageView lockIcon; + private TextView forgotPattern; + private int currentTries = 0; + private String savedPattern; + private long noteId; + private Handler handler = new Handler(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + // 设置全屏显示 + getWindow().setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN); + setContentView(R.layout.note_gesture_verify); + + initViews(); + setupListeners(); + loadSavedPattern(); + } + + private void initViews() { + lockPatternView = (LockPatternView) findViewById(R.id.lock_pattern_view); + gestureStatus = (TextView) findViewById(R.id.gesture_status); + lockIcon = (ImageView) findViewById(R.id.iv_lock_icon); + forgotPattern = (TextView) findViewById(R.id.tv_forgot_pattern); + + // 设置初始状态 + updateStatusText(getString(R.string.gesture_verify_hint)); + } + + private void setupListeners() { + lockPatternView.setPatternListener(new LockPatternView.OnPatternListener() { + @Override + public void onPatternComplete(String pattern) { + verifyPattern(pattern); + } + }); + + forgotPattern.setOnClickListener(v -> handleForgotPattern()); + } + + @SuppressLint("LongLogTag") + private void loadSavedPattern() { + Cursor cursor = null; + try { + noteId = getIntent().getLongExtra("note_id", -1); + if (noteId == -1) { + Log.e(TAG, "Invalid note ID"); + finishWithError(); + return; + } + + // 从数据库读取手势密码 + cursor = getContentResolver().query( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), + new String[]{Notes.NoteColumns.GESTURE_PASSWORD}, + null, null, null); + + if (cursor != null && cursor.moveToFirst()) { + savedPattern = cursor.getString(0); + if (savedPattern == null || savedPattern.isEmpty()) { + Log.e(TAG, "No pattern set for this note"); + finishWithSuccess(); // 如果没有设置密码，直接通过验证 + return; + } + } else { + Log.e(TAG, "Note not found"); + finishWithError(); + return; + } + } catch (Exception e) { + Log.e(TAG, "Error loading saved pattern", e); + finishWithError(); + } finally { + if (cursor != null) { + cursor.close(); + } + } + } + + private void verifyPattern(String pattern) { + if (pattern.equals(savedPattern)) { + showSuccessState(); + handler.postDelayed(this::finishWithSuccess, 500); + } else { + showErrorState(); + } + } + + private void showSuccessState() { + gestureStatus.setTextColor(getResources().getColor(R.color.gesture_success_color)); + gestureStatus.setText(R.string.gesture_verify_success); + lockIcon.setImageTintList(ColorStateList.valueOf( + getResources().getColor(R.color.gesture_success_color))); + + lockPatternView.showSuccess(); + + // 添加成功动画效果 + lockIcon.animate() + .scaleX(1.2f) + .scaleY(1.2f) + .setDuration(200) + .withEndAction(() -> { + lockIcon.animate() + .scaleX(1f) + .scaleY(1f) + .setDuration(100) + .start(); + }) + .start(); + } + + private void showErrorState() { + currentTries++; + if (currentTries >= MAX_TRIES) { + finishWithError(); + return; + } + + gestureStatus.setTextColor(getResources().getColor(R.color.gesture_point_error)); + gestureStatus.setText(getString(R.string.gesture_verify_error, MAX_TRIES - currentTries)); + lockIcon.setImageTintList(ColorStateList.valueOf( + getResources().getColor(R.color.gesture_point_error))); + + lockPatternView.showError(); + + // 添加错误动画效果 + lockIcon.animate() + .translationX(20f) + .setDuration(50) + .withEndAction(() -> { + lockIcon.animate() + .translationX(-20f) + .setDuration(100) + .withEndAction(() -> { + lockIcon.animate() + .translationX(0f) + .setDuration(50) + .start(); + }) + .start(); + }) + .start(); + + // 重置状态 + handler.postDelayed(() -> { + if (!isFinishing()) { + gestureStatus.setTextColor(getResources().getColor(R.color.gesture_text_color)); + gestureStatus.setText(R.string.gesture_verify_hint); + lockIcon.setImageTintList(ColorStateList.valueOf( + getResources().getColor(R.color.gesture_icon_color))); + } + }, 1000); + } + + private void handleForgotPattern() { + AlertDialog.Builder builder = new AlertDialog.Builder(this) + .setTitle(R.string.gesture_forgot_title) + .setMessage(R.string.gesture_forgot_message) + .setPositiveButton(R.string.ok, (dialog, which) -> { + // 这里可以添加重置密码的逻辑 + Toast.makeText(this, "请联系管理员重置密码", Toast.LENGTH_SHORT).show(); + }) + .setNegativeButton(R.string.cancel, null); + + AlertDialog dialog = builder.create(); + dialog.show(); + } + + private void finishWithSuccess() { + setResult(RESULT_OK); + finish(); + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); + } + + private void finishWithError() { + Toast.makeText(this, "验证失败次数过多，请稍后重试", Toast.LENGTH_SHORT).show(); + setResult(RESULT_CANCELED); + finish(); + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); + } + + private void updateStatusText(String text) { + if (gestureStatus != null) { + gestureStatus.setText(text); + } + } + + @Override + public void onBackPressed() { + // 返回时取消验证 + setResult(RESULT_CANCELED); + super.onBackPressed(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (handler != null) { + handler.removeCallbacksAndMessages(null); + } + } + +} \ No newline at end of file diff --git a/Src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/Src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index b53dfee..fb2f7ce 100644 --- a/Src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/Src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -64,6 +64,7 @@ import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.gtask.remote.GTaskSyncService; +import net.micode.notes.login.LoginActivity; import net.micode.notes.model.WorkingNote; import net.micode.notes.tool.BackupUtils; import net.micode.notes.tool.DataUtils; @@ -76,6 +77,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.Arrays; import java.util.HashSet; public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { @@ -173,10 +175,30 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt super.onCreate(savedInstanceState); setContentView(R.layout.note_list); initResources(); - + // 绑定登出按钮 + Button logoutButton = (Button) findViewById(R.id.btn_logout); + logoutButton.setOnClickListener(v -> logoutUser()); // 用户首次使用时插入介绍信息 setAppInfoFromRawRes(); } + @Override + protected void onResume() { + super.onResume(); + + // 检查当前用户是否已登录 + SharedPreferences prefs = getSharedPreferences("user_session", MODE_PRIVATE); + int userId = prefs.getInt("user_id", -1); + + if (userId == -1) { + // 如果用户未登录，跳转到登录页面 + Intent intent = new Intent(NotesListActivity.this, LoginActivity.class); + startActivity(intent); + finish(); // 关闭当前页面 + } else { + // 启动查询以刷新便签列表 + startAsyncNotesListQuery(); + } + } /** * 处理从其他活动返回的结果。 @@ -548,16 +570,37 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt * 根据当前文件夹ID选择不同的查询条件，启动一个后台查询处理该查询。 */ private void startAsyncNotesListQuery() { - // 根据当前文件夹ID选择查询条件 - String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION - : NORMAL_SELECTION; - // 启动查询，排序方式为类型降序，修改日期降序 - mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, - Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{ - String.valueOf(mCurrentFolderId) - }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + SharedPreferences prefs = getSharedPreferences("user_session", MODE_PRIVATE); + int userId = prefs.getInt("user_id", -1); + if (userId == -1) { + Log.e(TAG, "No user_id found in SharedPreferences, redirecting to login"); + startActivity(new Intent(this, LoginActivity.class)); + finish(); + return; + } + + Log.d(TAG, "Loaded user_id: " + userId); + + // 添加 user_id 到查询条件 + String selection = NoteColumns.USER_ID + "=?"; + String[] selectionArgs = {String.valueOf(userId)}; + + mBackgroundQueryHandler.startQuery( + FOLDER_NOTE_LIST_QUERY_TOKEN, + null, + Notes.CONTENT_NOTE_URI, + null, + selection, + selectionArgs, + null + ); } + + + + + /** * 处理后台查询的类。 * 继承自AsyncQueryHandler，用于处理异步查询完成后的操作。 @@ -577,24 +620,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt */ @Override protected void onQueryComplete(int token, Object cookie, Cursor cursor) { - switch (token) { - case FOLDER_NOTE_LIST_QUERY_TOKEN: - // 更新笔记列表适配器的数据源 - mNotesListAdapter.changeCursor(cursor); - break; - case FOLDER_LIST_QUERY_TOKEN: - // 根据查询结果展示或记录错误 - if (cursor != null && cursor.getCount() > 0) { - showFolderListMenu(cursor); - } else { - Log.e(TAG, "Query folder failed"); - } - break; - default: - // 对未知标记不做处理 + if (token == FOLDER_NOTE_LIST_QUERY_TOKEN) { + if (cursor == null || cursor.getCount() == 0) { + Log.e("BackgroundQueryHandler", "No notes found."); return; + } + + // 更新适配器的数据 + mNotesListAdapter.changeCursor(cursor); + mNotesListAdapter.notifyDataSetChanged(); + Log.d("BackgroundQueryHandler", "Adapter updated with new data."); } } + } /** @@ -1301,5 +1339,22 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt builder.setPositiveButton(android.R.string.ok, null); builder.show(); } + private void logoutUser() { + // 清空 SharedPreferences 中的用户会话数据 + SharedPreferences prefs = getSharedPreferences("user_session", MODE_PRIVATE); + SharedPreferences.Editor editor = prefs.edit(); + editor.clear(); // 清空所有存储的值 + editor.apply(); + + // 跳转到登录页面 + Intent intent = new Intent(NotesListActivity.this, LoginActivity.class); + startActivity(intent); + + // 销毁当前活动，避免返回后仍能访问 + finish(); + } + + + } diff --git a/Src/app/src/main/jniLibs/arm64-v8a/libjnidispatch.so b/Src/app/src/main/jniLibs/arm64-v8a/libjnidispatch.so new file mode 100644 index 0000000..61553b2 Binary files /dev/null and b/Src/app/src/main/jniLibs/arm64-v8a/libjnidispatch.so differ diff --git a/Src/app/src/main/jniLibs/arm64-v8a/libvosk.so b/Src/app/src/main/jniLibs/arm64-v8a/libvosk.so new file mode 100644 index 0000000..0746b58 Binary files /dev/null and b/Src/app/src/main/jniLibs/arm64-v8a/libvosk.so differ diff --git a/Src/app/src/main/jniLibs/armeabi-v7a/libjnidispatch.so b/Src/app/src/main/jniLibs/armeabi-v7a/libjnidispatch.so new file mode 100644 index 0000000..0683481 Binary files /dev/null and b/Src/app/src/main/jniLibs/armeabi-v7a/libjnidispatch.so differ diff --git a/Src/app/src/main/jniLibs/armeabi-v7a/libvosk.so b/Src/app/src/main/jniLibs/armeabi-v7a/libvosk.so new file mode 100644 index 0000000..d2daebf Binary files /dev/null and b/Src/app/src/main/jniLibs/armeabi-v7a/libvosk.so differ diff --git a/Src/app/src/main/jniLibs/x86/libjnidispatch.so b/Src/app/src/main/jniLibs/x86/libjnidispatch.so new file mode 100644 index 0000000..8587fdf Binary files /dev/null and b/Src/app/src/main/jniLibs/x86/libjnidispatch.so differ diff --git a/Src/app/src/main/jniLibs/x86/libvosk.so b/Src/app/src/main/jniLibs/x86/libvosk.so new file mode 100644 index 0000000..6ffc041 Binary files /dev/null and b/Src/app/src/main/jniLibs/x86/libvosk.so differ diff --git a/Src/app/src/main/jniLibs/x86_64/libjnidispatch.so b/Src/app/src/main/jniLibs/x86_64/libjnidispatch.so new file mode 100644 index 0000000..e3475dc Binary files /dev/null and b/Src/app/src/main/jniLibs/x86_64/libjnidispatch.so differ diff --git a/Src/app/src/main/jniLibs/x86_64/libvosk.so b/Src/app/src/main/jniLibs/x86_64/libvosk.so new file mode 100644 index 0000000..3ecff4c Binary files /dev/null and b/Src/app/src/main/jniLibs/x86_64/libvosk.so differ diff --git a/Src/app/src/main/res/color/text_color_state_list.xml b/Src/app/src/main/res/color/text_color_state_list.xml new file mode 100644 index 0000000..9f2521f --- /dev/null +++ b/Src/app/src/main/res/color/text_color_state_list.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Src/app/src/main/res/drawable/button_background.xml b/Src/app/src/main/res/drawable/button_background.xml new file mode 100644 index 0000000..2a793b3 --- /dev/null +++ b/Src/app/src/main/res/drawable/button_background.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Src/app/src/main/res/drawable/edittext_background.xml b/Src/app/src/main/res/drawable/edittext_background.xml new file mode 100644 index 0000000..c5358c5 --- /dev/null +++ b/Src/app/src/main/res/drawable/edittext_background.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Src/app/src/main/res/drawable/gesture_background.xml b/Src/app/src/main/res/drawable/gesture_background.xml new file mode 100644 index 0000000..7b83433 --- /dev/null +++ b/Src/app/src/main/res/drawable/gesture_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/Src/app/src/main/res/drawable/gesture_button_background.xml b/Src/app/src/main/res/drawable/gesture_button_background.xml new file mode 100644 index 0000000..6692a83 --- /dev/null +++ b/Src/app/src/main/res/drawable/gesture_button_background.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/Src/app/src/main/res/drawable/gesture_panel_background.xml b/Src/app/src/main/res/drawable/gesture_panel_background.xml new file mode 100644 index 0000000..2e3c374 --- /dev/null +++ b/Src/app/src/main/res/drawable/gesture_panel_background.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Src/app/src/main/res/drawable/ic_audio.png b/Src/app/src/main/res/drawable/ic_audio.png new file mode 100644 index 0000000..19b0d11 Binary files /dev/null and b/Src/app/src/main/res/drawable/ic_audio.png differ diff --git a/Src/app/src/main/res/drawable/ic_lock_outline.xml b/Src/app/src/main/res/drawable/ic_lock_outline.xml new file mode 100644 index 0000000..b22c676 --- /dev/null +++ b/Src/app/src/main/res/drawable/ic_lock_outline.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/Src/app/src/main/res/drawable/ic_warning.png b/Src/app/src/main/res/drawable/ic_warning.png new file mode 100644 index 0000000..6775ff1 Binary files /dev/null and b/Src/app/src/main/res/drawable/ic_warning.png differ diff --git a/Src/app/src/main/res/drawable/toast_background.xml b/Src/app/src/main/res/drawable/toast_background.xml new file mode 100644 index 0000000..ad5cfe6 --- /dev/null +++ b/Src/app/src/main/res/drawable/toast_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Src/app/src/main/res/layout/activity_login.xml b/Src/app/src/main/res/layout/activity_login.xml new file mode 100644 index 0000000..e777037 --- /dev/null +++ b/Src/app/src/main/res/layout/activity_login.xml @@ -0,0 +1,54 @@ + + + + + + + +