diff --git a/src/Notes-master/.gradle/7.0.2/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/7.0.2/executionHistory/executionHistory.bin index 7df9d378..2551df33 100644 Binary files a/src/Notes-master/.gradle/7.0.2/executionHistory/executionHistory.bin and b/src/Notes-master/.gradle/7.0.2/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master/.gradle/7.0.2/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/7.0.2/executionHistory/executionHistory.lock index 26fca218..eb580feb 100644 Binary files a/src/Notes-master/.gradle/7.0.2/executionHistory/executionHistory.lock and b/src/Notes-master/.gradle/7.0.2/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master/.gradle/7.0.2/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/7.0.2/fileHashes/fileHashes.bin index c3eff77e..9a409a87 100644 Binary files a/src/Notes-master/.gradle/7.0.2/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/7.0.2/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master/.gradle/7.0.2/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/7.0.2/fileHashes/fileHashes.lock index 0fee7dbe..b0dd7bac 100644 Binary files a/src/Notes-master/.gradle/7.0.2/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/7.0.2/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master/.gradle/7.0.2/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/7.0.2/fileHashes/resourceHashesCache.bin index 21bd7a00..174551c3 100644 Binary files a/src/Notes-master/.gradle/7.0.2/fileHashes/resourceHashesCache.bin and b/src/Notes-master/.gradle/7.0.2/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master/.gradle/7.0.2/javaCompile/classAnalysis.bin b/src/Notes-master/.gradle/7.0.2/javaCompile/classAnalysis.bin index f74b331f..de5bade7 100644 Binary files a/src/Notes-master/.gradle/7.0.2/javaCompile/classAnalysis.bin and b/src/Notes-master/.gradle/7.0.2/javaCompile/classAnalysis.bin differ diff --git a/src/Notes-master/.gradle/7.0.2/javaCompile/jarAnalysis.bin b/src/Notes-master/.gradle/7.0.2/javaCompile/jarAnalysis.bin index 6a84c4a5..aceadc8e 100644 Binary files a/src/Notes-master/.gradle/7.0.2/javaCompile/jarAnalysis.bin and b/src/Notes-master/.gradle/7.0.2/javaCompile/jarAnalysis.bin differ diff --git a/src/Notes-master/.gradle/7.0.2/javaCompile/javaCompile.lock b/src/Notes-master/.gradle/7.0.2/javaCompile/javaCompile.lock index 495df221..211adc8e 100644 Binary files a/src/Notes-master/.gradle/7.0.2/javaCompile/javaCompile.lock and b/src/Notes-master/.gradle/7.0.2/javaCompile/javaCompile.lock differ diff --git a/src/Notes-master/.gradle/7.0.2/javaCompile/taskHistory.bin b/src/Notes-master/.gradle/7.0.2/javaCompile/taskHistory.bin index fb92f83c..a2820d5e 100644 Binary files a/src/Notes-master/.gradle/7.0.2/javaCompile/taskHistory.bin and b/src/Notes-master/.gradle/7.0.2/javaCompile/taskHistory.bin differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d7f3479a..fa68bfb2 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin index 0dad0de2..dd4813fb 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master/.idea/Notes-master.iml b/src/Notes-master/.idea/Notes-master.iml index d6ebd480..71abca07 100644 --- a/src/Notes-master/.idea/Notes-master.iml +++ b/src/Notes-master/.idea/Notes-master.iml @@ -1,8 +1,18 @@ - - + + + + + + + + - + + + + diff --git a/src/Notes-master/.idea/deploymentTargetDropDown.xml b/src/Notes-master/.idea/deploymentTargetDropDown.xml index 33623d9d..25951fd9 100644 --- a/src/Notes-master/.idea/deploymentTargetDropDown.xml +++ b/src/Notes-master/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/src/Notes-master/.idea/misc.xml b/src/Notes-master/.idea/misc.xml index 360e6d41..3ce3af39 100644 --- a/src/Notes-master/.idea/misc.xml +++ b/src/Notes-master/.idea/misc.xml @@ -1,5 +1,50 @@ + + + diff --git a/src/Notes-master/.idea/render.experimental.xml b/src/Notes-master/.idea/render.experimental.xml new file mode 100644 index 00000000..8ec256a5 --- /dev/null +++ b/src/Notes-master/.idea/render.experimental.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/0/5/05efc8b1657769a27696d478ded1e95f38737233 b/src/Notes-master/.idea/sonarlint/issuestore/0/2/0268ec648e2fc0139b30ed13396174b7392c1ae2 similarity index 100% rename from src/Notes-master/.idea/sonarlint/issuestore/0/5/05efc8b1657769a27696d478ded1e95f38737233 rename to src/Notes-master/.idea/sonarlint/issuestore/0/2/0268ec648e2fc0139b30ed13396174b7392c1ae2 diff --git a/src/Notes-master/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 b/src/Notes-master/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 new file mode 100644 index 00000000..c1008224 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 @@ -0,0 +1,11 @@ + +s +java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 185.( +> +java:S1125T"(Remove the unnecessary boolean literals.( +m +java:S3776p"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.( +C +java:S1125q"(Remove the unnecessary boolean literals.( +> +java:S1125r"(Remove the unnecessary boolean literals.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 b/src/Notes-master/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 new file mode 100644 index 00000000..6394e175 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 @@ -0,0 +1,21 @@ + +Y +java:S1214#"CMove constants defined in this interfaces to another class or enum.( +I +java:S10685".Remove this unused "SENTENCE_5" private field.( +c +java:S1192e"HDefine a constant instead of duplicating this literal " BEGIN " 4 times.( +a +java:S1192t"FDefine a constant instead of duplicating this literal "=old." 6 times.( +c +java:S1192"GDefine a constant instead of duplicating this literal " BEGIN" 6 times.( +_ +java:S1192h"IDefine a constant instead of duplicating this literal " WHERE " 8 times.(랰 +\ +java:S1192h"FDefine a constant instead of duplicating this literal "=new." 6 times.(랰 +h +java:S1192"RDefine a constant instead of duplicating this literal " AFTER DELETE ON " 3 times.(B +c +java:S1192g"HDefine a constant instead of duplicating this literal " SET " 8 times.(˓ +` +java:S1192f"JDefine a constant instead of duplicating this literal " UPDATE " 8 times.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a b/src/Notes-master/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a new file mode 100644 index 00000000..a4843ed2 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a @@ -0,0 +1,39 @@ + +7 +java:S1116,"Remove this empty statement.( +K +java:S1874/"5Remove this use of "CursorAdapter"; it is deprecated.( +J +java:S2864^"4Iterate over the "entrySet" instead of the "keySet".(਷ +B +java:S1125_"'Remove the unnecessary boolean literal.(ɯ +J +java:S2864n"4Iterate over the "entrySet" instead of the "keySet".(਷ +B +java:S1125o"'Remove the unnecessary boolean literal.(ɯ +A +java:S1168|"+Return an empty collection instead of null.( +C +java:S1125"'Remove the unnecessary boolean literal.( +t +java:S22930"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə +o +java:S2293]"YReplace the type specification in this constructor call with the diamond operator ("<>").( +o +java:S2293m"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ +J +java:S1066U"/Merge this if statement with the enclosing one.(ڧ + +java:S1319\"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( + +java:S1319l"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +j +java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ +q +java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬 +E +java:S5411_"*Use the primitive boolean expression here.(ɯ +E +java:S5411o"*Use the primitive boolean expression here.(ɯ +F +java:S5411"*Use the primitive boolean expression here.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/2/b/2bfc771e07e87c37d3a76a2c815bc8fb30649798 b/src/Notes-master/.idea/sonarlint/issuestore/2/b/2bfc771e07e87c37d3a76a2c815bc8fb30649798 new file mode 100644 index 00000000..f5fec6c0 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/2/b/2bfc771e07e87c37d3a76a2c815bc8fb30649798 @@ -0,0 +1,14 @@ + +r +java:S1450#"\Remove the "mIs24HourView" field and declare it as a local variable in the relevant methods.( +h java:S100("NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +L +java:S1874="1Remove this use of "setButton"; it is deprecated.( +H +java:S1874>"2Remove this use of "setButton2"; it is deprecated.( +P +java:S1874P"5Remove this use of "FORMAT_24HOUR"; it is deprecated.( +G +java:S1068#"1Remove this unused "mIs24HourView" private field.( +> +java:S1604/"(Make this anonymous inner class a lambda(˽ \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 b/src/Notes-master/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 new file mode 100644 index 00000000..ae9c7e0c --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 @@ -0,0 +1,35 @@ + +U +java:S1118&":Add a private constructor to hide the implicit public one.( +Z +java:S2147E"DCombine this catch with the one at line 67, which has the same body.(暩 +[ +java:S2147l"ECombine this catch with the one at line 106, which has the same body.(暩 +k +java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".( +m +java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( +f +java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ʹ +m +java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( +t +java:S22932"YReplace the type specification in this constructor call with the diamond operator ("<>").(л +t +java:S2293Z"YReplace the type specification in this constructor call with the diamond operator ("<>").(л +u +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(ª +b +java:S1192D"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.( +c +java:S1192x"HDefine a constant instead of duplicating this literal "=? AND " 4 times.( +J +java:S1066~"/Merge this if statement with the enclosing one.(䲜 +v +java:S1319("`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".( +{ +java:S1319S"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(󆱋 + +java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +T +java:S1155-">Use isEmpty() to check whether the collection is empty or not.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 b/src/Notes-master/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 new file mode 100644 index 00000000..403cf480 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 @@ -0,0 +1,23 @@ + +H +java:S1874X"2Remove this use of "isScreenOn"; it is deprecated.( +O +java:S1874b":Remove this use of "setAudioStreamType"; it is deprecated.(0 +U +java:S1874d":Remove this use of "setAudioStreamType"; it is deprecated.(Ũ +` +java:S2147n"ECombine this catch with the one at line 107, which has the same body.( +[ +java:S2147q"ECombine this catch with the one at line 107, which has the same body.( +[ +java:S2147t"ECombine this catch with the one at line 107, which has the same body.(ﭣ +M +java:S1135l"2Complete the task associated to this TODO comment.(̐ +M +java:S1135o"2Complete the task associated to this TODO comment.(̐ +M +java:S1135r"2Complete the task associated to this TODO comment.(̐ +M +java:S1135u"2Complete the task associated to this TODO comment.(̐ +g +java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(۫ \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/4/5/4529b3a97b0f3b19b895aa06f23bed63ff38a312 b/src/Notes-master/.idea/sonarlint/issuestore/4/5/4529b3a97b0f3b19b895aa06f23bed63ff38a312 index 9d26733a..4ba2f4f2 100644 --- a/src/Notes-master/.idea/sonarlint/issuestore/4/5/4529b3a97b0f3b19b895aa06f23bed63ff38a312 +++ b/src/Notes-master/.idea/sonarlint/issuestore/4/5/4529b3a97b0f3b19b895aa06f23bed63ff38a312 @@ -1,6 +1,8 @@ T java:S1874K"9Remove this use of "DefaultHttpClient"; it is deprecated.(믥 +B +java:S1905s"'Remove this unnecessary cast to "long".(ې H java:S1874"2Remove this use of "HttpParams"; it is deprecated.(ŋE M @@ -35,8 +37,6 @@ L java:S1874"0Remove this use of "HttpPost"; it is deprecated.( I java:S1874"2Remove this use of "HttpEntity"; it is deprecated.(ۅ -F -java:S2093"*Change this "try" to a try-with-resources.( G java:S1874"0Remove this use of "HttpPost"; it is deprecated.(꠶ \ @@ -66,6 +66,4 @@ java:S1874 [ java:S1874"?Remove this use of "ClientProtocolException"; it is deprecated.( u -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(各 -a -java:S2184s"FCast one of the operands of this multiplication operation to a "long".(⣛ \ No newline at end of file +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(各 \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9 b/src/Notes-master/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9 new file mode 100644 index 00000000..24c964a8 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9 @@ -0,0 +1,13 @@ + +M +java:S1135c"2Complete the task associated to this TODO comment.( +^ +java:S1126"BReplace this if-then-else statement by a single method invocation.(忥 +P +java:S2864"4Iterate over the "entrySet" instead of the "keySet".(Κ +o +java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").( +D +java:S1604"(Make this anonymous inner class a lambda( +f +java:S1301h"KReplace this "switch" statement by "if" statements to increase readability.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/Notes-master/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c new file mode 100644 index 00000000..4652af23 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c @@ -0,0 +1,49 @@ + +n +java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.( +n +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ +O +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(( +K +java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ +N +java:S1135"2Complete the task associated to this TODO comment.( +8 +java:S1116"Remove this empty statement.( +X +java:S1126"AReplace this if-then-else statement by a single return statement.( +8 +java:S1116"Remove this empty statement.( +U +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( +G +java:S1874"0Remove this use of "getColor"; it is deprecated.( +d +java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".( +U +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( +T +java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð +R +java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.( +[ +java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ +t +java:S2293W"YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ +t +java:S2293`"YReplace the type specification in this constructor call with the diamond operator ("<>").( +t +java:S2293i"YReplace the type specification in this constructor call with the diamond operator ("<>").( +o +java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").( +p +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 +? +java:S1604"(Make this anonymous inner class a lambda(ά +? +java:S1604"(Make this anonymous inner class a lambda( +? +java:S1604"(Make this anonymous inner class a lambda(ߒ +O +java:S3516"9Refactor this method to not always return the same value.(l \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/0/7/0712df971a99ac4d2fccb8e0fb19f377f3374cca b/src/Notes-master/.idea/sonarlint/issuestore/5/8/5836a695995df8fadacfa6409fe8d21d88946842 similarity index 100% rename from src/Notes-master/.idea/sonarlint/issuestore/0/7/0712df971a99ac4d2fccb8e0fb19f377f3374cca rename to src/Notes-master/.idea/sonarlint/issuestore/5/8/5836a695995df8fadacfa6409fe8d21d88946842 diff --git a/src/Notes-master/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad b/src/Notes-master/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad new file mode 100644 index 00000000..505f811c --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad @@ -0,0 +1,9 @@ + +m +java:S37763"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.( +O +java:S1874?"9Remove this use of "setTextAppearance"; it is deprecated.( +O +java:S1874F"9Remove this use of "setTextAppearance"; it is deprecated.( +O +java:S1874P"9Remove this use of "setTextAppearance"; it is deprecated.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5 b/src/Notes-master/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5 new file mode 100644 index 00000000..841b6cd8 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5 @@ -0,0 +1,13 @@ + + +java:S3008L"eRename this field "NOTES_SNIPPET_SEARCH_QUERY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +_ +java:S1659"CDeclare "noteId" and all following declarations on a separate line.(ؘ +T +java:S2130"8Use "Long.parseLong" for this string-to-long conversion.( +N +java:S1135"2Complete the task associated to this TODO comment.( +i +java:S1192"MDefine a constant instead of duplicating this literal "Unknown URI " 4 times.( +M +java:S1153"1Directly append the argument of String.valueOf().(ߦ \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/6/c/6cbf8bd9aa98eff862b1dc067330ba66ba4493aa b/src/Notes-master/.idea/sonarlint/issuestore/6/c/6cbf8bd9aa98eff862b1dc067330ba66ba4493aa new file mode 100644 index 00000000..5795f0af --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/6/c/6cbf8bd9aa98eff862b1dc067330ba66ba4493aa @@ -0,0 +1,11 @@ + +V +java:S3398"?Move this method into the anonymous class declared at line 118.( +> +java:S1604C"(Make this anonymous inner class a lambda(׮ +C +java:S1604L"(Make this anonymous inner class a lambda(Ҵѝ +C +java:S1604v"(Make this anonymous inner class a lambda(ё +? +java:S1604"(Make this anonymous inner class a lambda( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 b/src/Notes-master/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 new file mode 100644 index 00000000..d0fcee2c --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 @@ -0,0 +1,11 @@ + +3 +java:S2386A"Make this member "protected".( +8 +java:S2386K"Make this member "protected".(㳎 +X +java:S1126"AReplace this if-then-else statement by a single return statement.( +? +java:S1125"(Remove the unnecessary boolean literals.( +F +java:S1066"/Merge this if statement with the enclosing one.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/f/b/fbe448ebfc3eb2d4e308f6b8b043666f5b57235e b/src/Notes-master/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e similarity index 100% rename from src/Notes-master/.idea/sonarlint/issuestore/f/b/fbe448ebfc3eb2d4e308f6b8b043666f5b57235e rename to src/Notes-master/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e diff --git a/src/Notes-master/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f b/src/Notes-master/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f new file mode 100644 index 00000000..b3c18084 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f @@ -0,0 +1,11 @@ + +P +java:S1118":Add a private constructor to hide the implicit public one.( +q +java:S3252!"VUse static access with "android.provider.ContactsContract$DataColumns" for "MIMETYPE".( +r +java:S3252""\Use static access with "android.provider.ContactsContract$DataColumns" for "RAW_CONTACT_ID".( +t +java:S32524"^Use static access with "android.provider.ContactsContract$ContactsColumns" for "DISPLAY_NAME".( +t +java:S2293)"YReplace the type specification in this constructor call with the diamond operator ("<>").( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af b/src/Notes-master/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af new file mode 100644 index 00000000..9b461201 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af @@ -0,0 +1,17 @@ + +k java:S116w"VRename this field "TEXT_FORMAT" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ћ +i +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 27 to the 15 allowed.( +h +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.( +\ +java:S2147"ECombine this catch with the one at line 302, which has the same body.(ߝȴ +F +java:S2093"*Change this "try" to a try-with-resources.( +\ +java:S2147"ECombine this catch with the one at line 345, which has the same body.(ﭣ +] java:S899"BDo something with the "boolean" value returned by "createNewFile".(А +9 +java:S3398H"#Move this method into "TextExport".( +? +java:S3398"#Move this method into "TextExport".( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 b/src/Notes-master/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 new file mode 100644 index 00000000..7fdf7858 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 @@ -0,0 +1,12 @@ + +t java:S115"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(Ï +U +java:S11184":Add a private constructor to hide the implicit public one.(͓ +^ +java:S1214C"CMove constants defined in this interfaces to another class or enum.(⸫ +Z +java:S1214"CMove constants defined in this interfaces to another class or enum.( +V +java:S1118":Add a private constructor to hide the implicit public one.( +Q +java:S1118":Add a private constructor to hide the implicit public one.(߀ \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/a/b/ab153b0256bc5f6c194e188cec0b8e327e347a90 b/src/Notes-master/.idea/sonarlint/issuestore/a/b/ab153b0256bc5f6c194e188cec0b8e327e347a90 index a22f76ed..2c986db5 100644 --- a/src/Notes-master/.idea/sonarlint/issuestore/a/b/ab153b0256bc5f6c194e188cec0b8e327e347a90 +++ b/src/Notes-master/.idea/sonarlint/issuestore/a/b/ab153b0256bc5f6c194e188cec0b8e327e347a90 @@ -10,17 +10,17 @@ java:S3776 n java:S3776"RRefactor this method to reduce its Cognitive Complexity from 41 to the 15 allowed.(˰ n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 34 to the 15 allowed.(ɸ +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 34 to the 15 allowed.(ɸ 5 -java:S2129"Remove this "Long" constructor(ϭ +java:S2129"Remove this "Long" constructor(ϭ n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(ƶؠ +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(ƶؠ G -java:S1172"+Remove this unused method parameter "node".(ƶؠ +java:S1172"+Remove this unused method parameter "node".(ƶؠ C -java:S1905"'Remove this unnecessary cast to "Node".( +java:S1905"'Remove this unnecessary cast to "Node".( > -java:S1905"'Remove this unnecessary cast to "Node".( +java:S1905"'Remove this unnecessary cast to "Node".( o java:S2293]"YReplace the type specification in this constructor call with the diamond operator ("<>").( t @@ -39,9 +39,5 @@ K java:S1066"/Merge this if statement with the enclosing one.( K java:S1066"/Merge this if statement with the enclosing one.(˼֓ -i -java:S2259"M"NullPointerException" will be thrown when invoking method "doContentSync()".( -i -java:S2259"M"NullPointerException" will be thrown when invoking method "doContentSync()".( S java:S2589"7Remove this expression which always evaluates to "true"(락 \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 new file mode 100644 index 00000000..501ac839 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 @@ -0,0 +1,77 @@ + +X java:S125B"").(艥 +> +java:S1604"(Make this anonymous inner class a lambda(̺V +? +java:S1604"(Make this anonymous inner class a lambda(ά +? +java:S1604"(Make this anonymous inner class a lambda(ܴ +D +java:S1604"(Make this anonymous inner class a lambda( +? +java:S1604"(Make this anonymous inner class a lambda( +? +java:S1604"(Make this anonymous inner class a lambda(۱ +? +java:S1604"(Make this anonymous inner class a lambda(ά +g +java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/c/4/c42ad3cd6e664963fa1849c760a57d417d500ee7 b/src/Notes-master/.idea/sonarlint/issuestore/c/4/c42ad3cd6e664963fa1849c760a57d417d500ee7 new file mode 100644 index 00000000..9a59a4be --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/c/4/c42ad3cd6e664963fa1849c760a57d417d500ee7 @@ -0,0 +1,95 @@ + +P +java:S1118":Add a private constructor to hide the implicit public one.( +` +java:S1124"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(㘱 +[ +java:S1124"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(ρ +` +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ɖ +[ +java:S1124"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124!"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124#"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124%"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124'"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124)"EReorder the modifiers to comply with the Java Language Specification.(۲ +` +java:S1124+"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124-"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124/"EReorder the modifiers to comply with the Java Language Specification.(Ӎ +[ +java:S11241"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S11243"EReorder the modifiers to comply with the Java Language Specification.(̥ +[ +java:S11245"EReorder the modifiers to comply with the Java Language Specification.(Ƒ +Z +java:S11247"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S11249"EReorder the modifiers to comply with the Java Language Specification.( +Z +java:S1124;"EReorder the modifiers to comply with the Java Language Specification.(K +` +java:S1124="EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124?"EReorder the modifiers to comply with the Java Language Specification.(֫ +Z +java:S1124A"EReorder the modifiers to comply with the Java Language Specification.($ +[ +java:S1124C"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124E"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124G"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124I"EReorder the modifiers to comply with the Java Language Specification.(૵ +` +java:S1124K"EReorder the modifiers to comply with the Java Language Specification.(֐ +[ +java:S1124M"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124O"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124Q"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124S"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124U"EReorder the modifiers to comply with the Java Language Specification.(ʹ +` +java:S1124W"EReorder the modifiers to comply with the Java Language Specification.(ԣ +[ +java:S1124Y"EReorder the modifiers to comply with the Java Language Specification.(΢ +` +java:S1124["EReorder the modifiers to comply with the Java Language Specification.(Ō +` +java:S1124]"EReorder the modifiers to comply with the Java Language Specification.(Ȩ +[ +java:S1124_"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124a"EReorder the modifiers to comply with the Java Language Specification.(̀ +` +java:S1124c"EReorder the modifiers to comply with the Java Language Specification.(â +` +java:S1124e"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124g"EReorder the modifiers to comply with the Java Language Specification.(ƒ +` +java:S1124i"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124k"EReorder the modifiers to comply with the Java Language Specification.( +Z +java:S1124m"EReorder the modifiers to comply with the Java Language Specification.(†- +` +java:S1124o"EReorder the modifiers to comply with the Java Language Specification.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f b/src/Notes-master/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f new file mode 100644 index 00000000..73d403bf --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f @@ -0,0 +1,31 @@ + +P +java:S1118":Add a private constructor to hide the implicit public one.(ڦ +P +java:S1118*":Add a private constructor to hide the implicit public one.( +[ +java:S1124+"EReorder the modifiers to comply with the Java Language Specification.(Ɠ +` +java:S11243"EReorder the modifiers to comply with the Java Language Specification.( +D +java:S2140G")Use "java.util.Random.nextInt()" instead.( +U +java:S1118M":Add a private constructor to hide the implicit public one.(Ū +` +java:S1124N"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124V"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124^"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124f"EReorder the modifiers to comply with the Java Language Specification.(ɜ +Q +java:S1118":Add a private constructor to hide the implicit public one.(ֹ +a +java:S1124"EReorder the modifiers to comply with the Java Language Specification.( +a +java:S1124"EReorder the modifiers to comply with the Java Language Specification.( +V +java:S1118":Add a private constructor to hide the implicit public one.( +\ +java:S1124"EReorder the modifiers to comply with the Java Language Specification.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/d/1/d1cc822fa9d783a8d4563bf6e139b7ae10de2fb1 b/src/Notes-master/.idea/sonarlint/issuestore/d/1/d1cc822fa9d783a8d4563bf6e139b7ae10de2fb1 new file mode 100644 index 00000000..e52aeadf --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/d/1/d1cc822fa9d783a8d4563bf6e139b7ae10de2fb1 @@ -0,0 +1,3 @@ + +> +java:S1604)"(Make this anonymous inner class a lambda(ʩ \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/d/a/da57ce446af85bbd9aefee65e969869f0cff78b0 b/src/Notes-master/.idea/sonarlint/issuestore/d/a/da57ce446af85bbd9aefee65e969869f0cff78b0 new file mode 100644 index 00000000..51d85d9d --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/d/a/da57ce446af85bbd9aefee65e969869f0cff78b0 @@ -0,0 +1,46 @@ + +Q java:S1250"":Remove this unused "AUTHORITIES_FILTER_KEY" private field.(8/ +d +java:S1144"HRemove this unused private "showChangeAccountConfirmAlertDialog" method.( +? +java:S1604"(Make this anonymous inner class a lambda( +? +java:S1604"(Make this anonymous inner class a lambda(ά +F +java:S1604"(Make this anonymous inner class a lambda(8/ +F +java:S1604"(Make this anonymous inner class a lambda(î8/ +F +java:S1604"(Make this anonymous inner class a lambda(î8/ +n +java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(崡8/ \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb b/src/Notes-master/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb new file mode 100644 index 00000000..2aa2426b --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb @@ -0,0 +1,13 @@ + +\ +java:S1126}"AReplace this if-then-else statement by a single return statement.(Ʒ +i +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.( +\ +java:S2147"ECombine this catch with the one at line 242, which has the same body.(暩 +u +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(л +j +java:S1192?"ODefine a constant instead of duplicating this literal "Wrong note id:" 3 times.( +U +java:S1155">Use isEmpty() to check whether the collection is empty or not.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc b/src/Notes-master/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc index 16792e68..684fdc85 100644 --- a/src/Notes-master/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc +++ b/src/Notes-master/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc @@ -1,9 +1,8 @@ -r -java:S3923"[Remove this conditional structure or edit its code blocks so that they're not all the same.(ԡ +R java:S125"").(ʩ  -java:S1319"pThe return type of this method should be an interface such as "List" rather than the implementation "ArrayList".(ﷺ +java:S1319"pThe return type of this method should be an interface such as "List" rather than the implementation "ArrayList".(ﷺ \ java:S2259"@A "NullPointerException" could be thrown; "js" is nullable here.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/f/1/f1226eeacd46c914d51f3d1a6d6f27377490d2a4 b/src/Notes-master/.idea/sonarlint/issuestore/f/1/f1226eeacd46c914d51f3d1a6d6f27377490d2a4 index bda02beb..a19e1840 100644 --- a/src/Notes-master/.idea/sonarlint/issuestore/f/1/f1226eeacd46c914d51f3d1a6d6f27377490d2a4 +++ b/src/Notes-master/.idea/sonarlint/issuestore/f/1/f1226eeacd46c914d51f3d1a6d6f27377490d2a4 @@ -3,8 +3,10 @@ java:S2386."Make this member "protected".(u n java:S3776"RRefactor this method to reduce its Cognitive Complexity from 91 to the 15 allowed.( +R java:S125"").( u diff --git a/src/Notes-master/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 b/src/Notes-master/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 new file mode 100644 index 00000000..aff35b7e --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 @@ -0,0 +1,7 @@ + +3 +java:S2386!"Make this member "protected".(Ꙗ +K +java:S1874*"5Remove this use of "CursorAdapter"; it is deprecated.(ж +M +java:S1135+"2Complete the task associated to this TODO comment.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/index.pb b/src/Notes-master/.idea/sonarlint/issuestore/index.pb index 84f11ec0..706c8b60 100644 --- a/src/Notes-master/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master/.idea/sonarlint/issuestore/index.pb @@ -1,31 +1,67 @@ -@ -local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca -? -settings.gradle,0\5\05efc8b1657769a27696d478ded1e95f38737233 -X -(gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e +~ +Napp/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java,5\f\5f6162ca79fcea353b280c5dc84973a9c37d2c74 + +Oapp/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java,0\f\0f0f0549145d0e2bfb972ba1ed2e2c38bfd6d1b1 +k +;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a +k +;app/src/main/java/net/micode/notes/gtask/data/TaskList.java,e\0\e094aec5c3e1b6f44539adff3114f5a1ad603ddc +k +;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c +b +2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5 +p +@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13 +i +9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236 +h +8app/src/main/java/net/micode/notes/tool/BackupUtils.java,a\4\a446c87b1013132f8adaf83656b582028e8809af +k +;app/src/main/java/net/micode/notes/tool/ResourceParser.java,c\6\c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f +m +=app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java,3\e\3e688be40dc69cfd1062f41d0fc27fe261a26710 +l + + + + + + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 767aac47..6d953d93 100644 Binary files a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 8f8d5777..a28aa3a9 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index c4962f22..4a8853dc 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin index 2754b248..0324b555 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index 872e9d62..d99bd1a1 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin index b534c49b..84a6ed11 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin index 0b19b8cb..efab45d6 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_0/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_0/graph.bin similarity index 100% rename from src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_0/graph.bin rename to src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_0/graph.bin diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_1/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_1/graph.bin similarity index 100% rename from src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_1/graph.bin rename to src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_1/graph.bin diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_2/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_2/graph.bin similarity index 100% rename from src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_2/graph.bin rename to src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_2/graph.bin diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_3/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_3/graph.bin similarity index 100% rename from src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_3/graph.bin rename to src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_3/graph.bin diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_4/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_4/graph.bin similarity index 100% rename from src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_4/graph.bin rename to src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_4/graph.bin diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_5/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_5/graph.bin similarity index 100% rename from src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_5/graph.bin rename to src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_5/graph.bin diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_6/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_6/graph.bin similarity index 100% rename from src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_6/graph.bin rename to src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_6/graph.bin diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_7/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_7/graph.bin similarity index 100% rename from src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4a61e2b3b16d31e777322f3e5a663ad428b0be963750ee8c29ddfbee578cad05_bucket_7/graph.bin rename to src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3e4afaff3455bf98f486217c63b52746cbf4468c9f0faef5ec928a9294345da2_bucket_7/graph.bin diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_0/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_0/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_0/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_1/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_1/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_1/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_2/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_2/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_2/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_3/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_3/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_3/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_4/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_4/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_4/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_5/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_5/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_5/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_6/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_6/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_6/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_7/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_7/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b192ab5926dfce8117772ecfb43dda7def1fa35f9ecedcf22bbc99fd81330b5e_bucket_7/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex deleted file mode 100644 index a5fedde4..00000000 Binary files a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 62d386e8..87ca41d4 100644 Binary files a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index adfd1286..b5572ce5 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 9479b7ad..b539ad6f 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties deleted file mode 100644 index 283780d9..00000000 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ /dev/null @@ -1,96 +0,0 @@ -#Fri Oct 15 08:22:03 CST 2021 -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\xml\\searchable.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_edit.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable\\new_note.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\widget_4x.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\xml\\preferences.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\note_list_options.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\sub_folder.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\note_edit.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\widget_2x.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\add_account_text.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_item.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_list.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\raw\\introduction=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\note_list.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\settings_header.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cce..00000000 --- a/src/Notes-master/app/build/intermediates/incremental/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/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc5..00000000 --- a/src/Notes-master/app/build/intermediates/incremental/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/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index dfa7135d..00000000 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - -%s - --%s - --%s - --%s - - - Messaging - Email - - #335b5b5b - 26sp - 20sp - 17sp - 14sp - 33sp - - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - Confirm to delete folder and its notes? - Confirm to delete this note? - Confirm to delete the selected %d notes? - Delete selected notes - Notes - Notes 2x2 - Notes 4x4 - Delete - Call notes - cancel - set - Delete reminder successfully - Sorry, can not set clock on empty note - Sorry, can not send and empty note to home - The note is not exist - Export failed, please check SD card - SD card busy, not available now - Sync is canceled - Sync failed, internal error occurs - Sync failed, please check network and account settings - Export fail - notes_%s.txt - /MIUI/notes/ - The folder %1$s exist, please rename - yyyyMMdd - MMMd kk:mm - Export text file (%1$s) to SD (%2$s) directory - (%d) - Have moved selected %1$d notes to %2$s folder - Input name - Note added to home - Remind me - New Folder - Delete - Deselect all - Export text - Change folder name - Delete folder - View folder - Large - Medium - Font size - Small - Super - Enter check list - Move to folder - Parent folder - Leave check list - Delete reminder - Search - Select all - Nothing selected, the operation is invalid - %d selected - Send to home - Settings - Share - Sync - Cancel syncing - Select folder - Expired - Send email - Open map - Call - Browse web - Take a look - Got it - Add note - ... - Sync notes with google task - Sync account - Add account - New note background color random - Cancel syncing - Sync immediately - Current account %1$s - All sync related information will be deleted, which may result in duplicated items sometime - Please select a google account. Local notes will be synced with google task. - Sync notes - Last sync time %1$s - yyyy-MM-dd hh:mm:ss - Cancel - Change sync account - Remove sync account - Settings - Cannot change the account because sync is in progress - %1$s has been set as the sync account - Notes - Search notes - Searching Notes - Text in your notes - Set reminder - Export successful - Sync is successful with account %1$s - Getting remote note list... - Logging into %1$s... - Synchronize local notes with Google Task... - Sync is canceled - Sync is failed - Sync is successful - Syncing notes... - No associated note found, click to create associated note. - Privacy mode，can not see note content - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml deleted file mode 100644 index c274eafd..00000000 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - -%s - --%s - --%s - --%s - - Messaging - Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - 短信 - 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 - %1$s 条符合“%2$s”的搜索结果 - - 短信 - 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index bd6b83dd..60c3ba5b 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt deleted file mode 100644 index b05fb32e..00000000 --- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ /dev/null @@ -1,4 +0,0 @@ -#Fri Oct 15 08:22:12 CST 2021 -base.0=C\:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex -renamed.0=classes.dex -path.0=classes.dex diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources deleted file mode 100644 index 21e41f79..00000000 Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 deleted file mode 100644 index 945a7c54..00000000 Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class deleted file mode 100644 index f98637b9..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class deleted file mode 100644 index 6e28b50e..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class deleted file mode 100644 index 534af6e1..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class deleted file mode 100644 index 4be9a300..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class deleted file mode 100644 index 0d9547bf..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class deleted file mode 100644 index 37c051dc..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class deleted file mode 100644 index a78b61a1..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class deleted file mode 100644 index bdc56b1e..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class deleted file mode 100644 index 56d65f1e..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class deleted file mode 100644 index 1f3ea0b6..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class deleted file mode 100644 index 976265d9..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class deleted file mode 100644 index 2319eaf3..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class deleted file mode 100644 index d2dcfb58..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class deleted file mode 100644 index c61d69fc..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class deleted file mode 100644 index 26c68fbf..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class deleted file mode 100644 index d4e7deb4..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class deleted file mode 100644 index 69ac9b54..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class deleted file mode 100644 index 3c7e5b6f..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class deleted file mode 100644 index 06827bd0..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class index f305e185..ce335062 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index f105e8ce..57b28f06 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class deleted file mode 100644 index 30318fc9..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class deleted file mode 100644 index bbbea2e5..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class deleted file mode 100644 index 46734e71..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class deleted file mode 100644 index e9f5b68f..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class deleted file mode 100644 index bfb671cc..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class deleted file mode 100644 index ed4ac8e4..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class deleted file mode 100644 index fc1d9a26..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class deleted file mode 100644 index d4500ff4..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class deleted file mode 100644 index f1053bc0..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class deleted file mode 100644 index 34b5c021..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class deleted file mode 100644 index 1714fc2d..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class deleted file mode 100644 index 595f36d6..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class deleted file mode 100644 index 7ded6f48..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class deleted file mode 100644 index 79598f61..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class deleted file mode 100644 index 124eb6a5..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class deleted file mode 100644 index e8e0e458..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class deleted file mode 100644 index c3ee8d8b..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class deleted file mode 100644 index 4812c99d..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class deleted file mode 100644 index 0754ffc3..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class deleted file mode 100644 index dc60fe03..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class deleted file mode 100644 index 65972826..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class deleted file mode 100644 index ff95cab1..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class deleted file mode 100644 index 75a9a17b..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class deleted file mode 100644 index fa573a17..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class deleted file mode 100644 index 81d65133..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class deleted file mode 100644 index 66c9e6f8..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class deleted file mode 100644 index 86cabc19..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class deleted file mode 100644 index 5012ef98..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class deleted file mode 100644 index 354ae8e6..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class deleted file mode 100644 index 4064ac04..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class deleted file mode 100644 index 19383ea8..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class deleted file mode 100644 index 29d4cf94..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class deleted file mode 100644 index 432dd4e7..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class deleted file mode 100644 index ad7cce40..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class deleted file mode 100644 index 6e0f050c..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class deleted file mode 100644 index 1a3310a3..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class deleted file mode 100644 index 93cd34b0..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class deleted file mode 100644 index fea6568c..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class deleted file mode 100644 index 1588b992..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class deleted file mode 100644 index d4e78a1a..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class deleted file mode 100644 index e7ac3f67..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class deleted file mode 100644 index 11e437f7..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class deleted file mode 100644 index df2d946e..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class deleted file mode 100644 index dbd12f56..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class deleted file mode 100644 index 49817656..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class deleted file mode 100644 index 64f15ff5..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class deleted file mode 100644 index 817bf173..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class deleted file mode 100644 index 77d26080..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class deleted file mode 100644 index b979434c..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class deleted file mode 100644 index e8eaf4b5..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class deleted file mode 100644 index b243892a..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class deleted file mode 100644 index 06036f1d..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class deleted file mode 100644 index 08ab9fa6..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class deleted file mode 100644 index ff543cd9..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class deleted file mode 100644 index d42da3c8..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class deleted file mode 100644 index 5d8717b6..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class deleted file mode 100644 index b58eac37..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class deleted file mode 100644 index 9ec847b4..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class deleted file mode 100644 index 7598ed09..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class deleted file mode 100644 index 573ba346..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class deleted file mode 100644 index a1c7178f..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class deleted file mode 100644 index c01fcae1..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class deleted file mode 100644 index d7027b96..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class deleted file mode 100644 index 50533378..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class deleted file mode 100644 index f6e1ed89..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class deleted file mode 100644 index fabc84f3..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class deleted file mode 100644 index e33d1c04..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class deleted file mode 100644 index e315716e..00000000 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index e8bae7fc..732c5b48 100644 --- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -21,251 +21,250 @@ 21 22 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml +23-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml 24 android:targetSdkVersion="26" /> -24-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml +24-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml 25 26 -26-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:23:5-81 -26-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:23:22-78 +26-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:24:5-81 +26-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:24:22-78 27 -27-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:24:5-88 -27-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:24:22-85 +27-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:25:5-88 +27-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:25:22-85 28 -28-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:25:5-67 -28-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:25:22-64 +28-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:26:5-67 +28-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:26:22-64 29 -29-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:26:5-72 -29-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:26:22-69 +29-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:27:5-72 +29-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:27:22-69 30 -30-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:27:5-74 -30-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:27:22-71 +30-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:28:5-74 +30-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:28:22-71 31 -31-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:28:5-80 -31-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:28:22-77 +31-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:29:5-80 +31-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:29:22-77 32 -32-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:29:5-71 -32-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:29:22-68 +32-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:30:5-71 +32-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:30:22-68 33 -33-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:30:5-74 -33-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:30:22-71 +33-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:31:5-74 +33-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:31:22-71 34 -34-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:31:5-81 -34-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:31:22-78 +34-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:32:5-81 +34-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:32:22-78 35 36 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:33:5-147:19 +36-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:34:5-151:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:34:9-42 -39 android:label="@string/app_name" > -39-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:9-41 -40 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:36:9-49:20 -41 android:name="net.micode.notes.ui.NotesListActivity" -41-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:37:13-49 -42 android:configChanges="keyboardHidden|orientation|screenSize" -42-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:38:13-74 -43 android:label="@string/app_name" -43-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:39:13-45 -44 android:launchMode="singleTop" -44-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:40:13-43 -45 android:theme="@style/NoteTheme" -45-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 -46 android:uiOptions="splitActionBarWhenNarrow" -46-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:42:13-57 +38-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:35:9-42 +39 android:label="@string/app_name" +39-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:36:9-41 +40 android:testOnly="true" > +41 C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:37:9-52:20 +42 android:name="net.micode.notes.ui.NotesListActivity" +42-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:38:13-49 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:39:13-74 +44 android:label="@string/app_name" +44-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:40:13-45 +45 android:launchMode="singleTop" +45-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:41:13-43 +46 android:theme="@style/NoteTheme" +46-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:42:13-45 47 android:windowSoftInputMode="adjustPan" > -47-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:43:13-52 +47-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:46:13-52 48 -48-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:45:13-48:29 +48-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:48:13-51:29 49 -49-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:46:17-69 -49-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:46:25-66 +49-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:49:17-69 +49-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:49:25-66 50 51 -51-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:47:17-77 -51-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:47:27-74 +51-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:50:17-77 +51-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:50:27-74 52 53 54 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:51:9-79:20 +54-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:54:9-82:20 55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:52:13-48 +55-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:55:13-48 56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:53:13-74 +56-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:56:13-74 57 android:launchMode="singleTop" -57-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:54:13-43 +57-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:57:13-43 58 android:theme="@style/NoteTheme" > -58-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:55:13-45 +58-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:58:13-45 59 -59-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:57:13-62:29 +59-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:60:13-65:29 60 -60-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:58:17-69 -60-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:58:25-66 +60-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:61:17-69 +60-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:61:25-66 61 62 -62-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:17-76 -62-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:27-73 +62-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:62:17-76 +62-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:62:27-73 63 64 -64-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:17-78 -64-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:23-75 +64-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:63:17-78 +64-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:63:23-75 65 -65-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:17-78 -65-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:23-75 +65-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:63:17-78 +65-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:63:23-75 66 67 -67-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:64:13-69:29 +67-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:67:13-72:29 68 -68-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:65:17-79 -68-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:65:25-76 +68-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:68:17-79 +68-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:68:25-76 69 70 -70-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:17-76 -70-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:27-73 +70-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:62:17-76 +70-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:62:27-73 71 72 -72-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:17-78 -72-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:23-75 +72-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:63:17-78 +72-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:63:23-75 73 -73-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:17-78 -73-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:23-75 +73-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:63:17-78 +73-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:63:23-75 74 75 -75-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:71:13-74:29 +75-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:74:13-77:29 76 -76-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:72:17-71 -76-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:72:25-68 +76-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:75:17-71 +76-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:75:25-68 77 78 -78-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:17-76 -78-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:27-73 +78-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:62:17-76 +78-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:62:27-73 79 80 81 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:76:13-78:54 +81-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:79:13-81:54 82 android:name="android.app.searchable" -82-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:77:17-54 +82-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:80:17-54 83 android:resource="@xml/searchable" /> -83-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:78:17-51 +83-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:81:17-51 84 85 86 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:81:9-84:43 +86-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:84:9-87:43 87 android:name="net.micode.notes.data.NotesProvider" -87-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:82:13-63 +87-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:85:13-63 88 android:authorities="micode_notes" -88-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:83:13-47 +88-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:86:13-47 89 android:multiprocess="true" /> -89-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:84:13-40 +89-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:87:13-40 90 91 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:86:9-98:20 +91-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:89:9-101:20 92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -92-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:87:13-57 +92-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:90:13-57 93 android:label="@string/app_widget2x2" > -93-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:88:13-50 +93-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:91:13-50 94 -94-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:89:13-93:29 +94-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:92:13-96:29 95 -95-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:90:17-84 -95-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:90:25-81 +95-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:93:17-84 +95-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:93:25-81 96 -96-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:91:17-85 -96-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:91:25-82 +96-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +96-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 97 -97-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 -97-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 +97-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:95:17-85 +97-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:95:25-82 98 99 100 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:95:13-97:58 +100-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:98:13-100:58 101 android:name="android.appwidget.provider" -101-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:96:17-58 +101-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:99:17-58 102 android:resource="@xml/widget_2x_info" /> -102-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:97:17-55 +102-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:100:17-55 103 104 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:99:9-112:20 +104-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:102:9-115:20 105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -105-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:100:13-57 +105-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:103:13-57 106 android:label="@string/app_widget4x4" > -106-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:101:13-50 +106-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:104:13-50 107 -107-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:89:13-93:29 +107-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:92:13-96:29 108 -108-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:90:17-84 -108-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:90:25-81 +108-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:93:17-84 +108-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:93:25-81 109 -109-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:91:17-85 -109-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:91:25-82 +109-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +109-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 110 -110-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 -110-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 +110-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:95:17-85 +110-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:95:25-82 111 112 113 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:95:13-97:58 +113-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:98:13-100:58 114 android:name="android.appwidget.provider" -114-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:96:17-58 +114-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:99:17-58 115 android:resource="@xml/widget_4x_info" /> -115-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:97:17-55 +115-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:100:17-55 116 117 -117-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:114:9-118:20 -117-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:114:19-55 +117-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:117:9-121:20 +117-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:117:19-55 118 -118-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:115:13-117:29 +118-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:118:13-120:29 119 -119-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:116:17-79 -119-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:116:25-76 +119-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:119:17-79 +119-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:119:25-76 120 121 122 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:120:9-123:20 +122-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:123:9-126:20 123 android:name="net.micode.notes.ui.AlarmReceiver" -123-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:121:13-61 +123-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:124:13-61 124 android:process=":remote" > -124-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:122:13-38 +124-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:125:13-38 125 126 127 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:125:9-130:20 +127-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:128:9-133:20 128 android:name="net.micode.notes.ui.AlarmAlertActivity" -128-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:126:13-50 +128-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:129:13-50 129 android:label="@string/app_name" -129-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:127:13-45 +129-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:130:13-45 130 android:launchMode="singleInstance" -130-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:128:13-48 +130-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:131:13-48 131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -131-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:129:13-75 +131-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:132:13-75 132 133 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:132:9-137:20 +133-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:135:9-140:20 134 android:name="net.micode.notes.ui.NotesPreferenceActivity" -134-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:133:13-71 +134-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:136:13-71 135 android:label="@string/preferences_title" -135-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:134:13-54 +135-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:137:13-54 136 android:launchMode="singleTop" -136-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:135:13-43 +136-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:138:13-43 137 android:theme="@android:style/Theme.Holo.Light" > -137-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:136:13-60 +137-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:139:13-60 138 139 140 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:139:9-142:19 +140-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:142:9-146:19 141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -141-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:140:13-74 +141-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:143:13-74 142 android:exported="false" > -142-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:13-37 +142-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:144:13-37 143 144 145 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:144:9-146:52 +145-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:148:9-150:52 146 android:name="android.app.default_searchable" -146-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:145:13-58 +146-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:149:13-58 147 android:value=".ui.NoteEditActivity" /> -147-->C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:13-49 +147-->C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:150:13-49 148 149 150 diff --git a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index dabe1f40..9600ff55 100644 --- a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -36,14 +36,14 @@ + android:label="@string/app_name" + android:testOnly="true" > diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index dabe1f40..9600ff55 100644 --- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -36,14 +36,14 @@ + android:label="@string/app_name" + android:testOnly="true" > diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat deleted file mode 100644 index b65c446d..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat deleted file mode 100644 index 60cd968c..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat deleted file mode 100644 index d9e912ab..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat deleted file mode 100644 index d6c697b4..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat deleted file mode 100644 index a0bd6943..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat deleted file mode 100644 index 726bd9a7..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat deleted file mode 100644 index ee5ec827..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat deleted file mode 100644 index 859116fb..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat deleted file mode 100644 index 16960680..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat deleted file mode 100644 index b50a71a1..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat deleted file mode 100644 index f319e165..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat deleted file mode 100644 index 7c22631d..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat deleted file mode 100644 index 123da485..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat deleted file mode 100644 index 605499ec..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat deleted file mode 100644 index eeb7e195..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat deleted file mode 100644 index af1cd722..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat deleted file mode 100644 index 60017c79..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat deleted file mode 100644 index f079ca73..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat deleted file mode 100644 index ee682d77..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat deleted file mode 100644 index a637fa88..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat deleted file mode 100644 index c3e43f26..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat deleted file mode 100644 index 284b973f..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat deleted file mode 100644 index 7c372dcb..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat deleted file mode 100644 index bc1b57f0..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat deleted file mode 100644 index 79ee3530..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat deleted file mode 100644 index 09f33ce7..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat deleted file mode 100644 index 8d84e2cc..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat deleted file mode 100644 index 8ce3dcf5..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat deleted file mode 100644 index c6d8d0c5..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat deleted file mode 100644 index b86f121b..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat deleted file mode 100644 index ff27afe7..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat deleted file mode 100644 index c19b6b5c..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat deleted file mode 100644 index 004e07bb..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat deleted file mode 100644 index 6ce45963..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat deleted file mode 100644 index e8d0c86d..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat deleted file mode 100644 index d6b6ed9f..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat deleted file mode 100644 index d352b19f..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat deleted file mode 100644 index fd91c456..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat deleted file mode 100644 index 2a49d87c..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat deleted file mode 100644 index 53319ac9..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat deleted file mode 100644 index 3cd61f98..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat deleted file mode 100644 index 94bdf94d..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat deleted file mode 100644 index 2265e9f4..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat deleted file mode 100644 index 6f5fad98..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat deleted file mode 100644 index cefb2559..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat deleted file mode 100644 index 0c3af01e..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat deleted file mode 100644 index b6bb0fb3..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat deleted file mode 100644 index 1ef7b31d..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat deleted file mode 100644 index a056ef64..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat deleted file mode 100644 index 554c4b58..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat deleted file mode 100644 index 6e3708dd..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat deleted file mode 100644 index 677415fe..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat deleted file mode 100644 index e600a365..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat deleted file mode 100644 index 6b718adc..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat deleted file mode 100644 index f04a1cb1..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat deleted file mode 100644 index d26241b1..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat deleted file mode 100644 index fd646bc9..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat deleted file mode 100644 index 85a25791..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat deleted file mode 100644 index 56e9ff78..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat deleted file mode 100644 index 397ff1c4..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat deleted file mode 100644 index ac08d2b3..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat deleted file mode 100644 index b2dbca04..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat deleted file mode 100644 index e403ccc0..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat deleted file mode 100644 index ec37db29..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat deleted file mode 100644 index 24ab859f..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat deleted file mode 100644 index 46d06a7d..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat deleted file mode 100644 index 8e8c0013..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat deleted file mode 100644 index afbb1a92..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat index 2ff1a8c3..b8d411fb 100644 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat index af2987c4..252513a9 100644 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat deleted file mode 100644 index 4079ee63..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat deleted file mode 100644 index 88a50c91..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat deleted file mode 100644 index a85687e9..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat deleted file mode 100644 index a084a9ea..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat deleted file mode 100644 index 40802b1c..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat deleted file mode 100644 index 7b143926..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat deleted file mode 100644 index 38052399..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat deleted file mode 100644 index cce9c88a..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat deleted file mode 100644 index 0c1705c4..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat deleted file mode 100644 index aac02670..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat deleted file mode 100644 index 8a2f6e96..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat deleted file mode 100644 index ed03b0b9..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat deleted file mode 100644 index df2fe296..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat deleted file mode 100644 index ebc8f389..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat deleted file mode 100644 index f04148fa..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat deleted file mode 100644 index 7cd1244f..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat deleted file mode 100644 index e416afee..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat deleted file mode 100644 index 5460705c..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat deleted file mode 100644 index 0984b11d..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat deleted file mode 100644 index 7cd600e1..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat deleted file mode 100644 index c2b74b65..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat deleted file mode 100644 index 733add6d..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat deleted file mode 100644 index 3d6c685f..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat deleted file mode 100644 index ddbaa63a..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat deleted file mode 100644 index 7ad0ab92..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat deleted file mode 100644 index 66d01a01..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat deleted file mode 100644 index f42607ae..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat deleted file mode 100644 index d3b4f7e3..00000000 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json deleted file mode 100644 index ab45d501..00000000 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "logs": [ - { - "outputFile": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - } - ] - }, - { - "outputFile": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, - { - "outputFile": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat", - "map": [ - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "532", - "endColumns": "56", - "endOffsets": "584" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186", - "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": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", - "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "589,641,694,747,799", - "endColumns": "51,52,52,51,51", - "endOffsets": "636,689,742,794,846" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,412", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "407,527" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203", - "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": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json deleted file mode 100644 index 39f263bd..00000000 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "logs": [ - { - "outputFile": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", - "map": [ - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json deleted file mode 100644 index c2a2c1f6..00000000 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "logs": [ - { - "outputFile": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", - "map": [ - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json deleted file mode 100644 index 1be23147..00000000 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "logs": [ - { - "outputFile": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", - "map": [ - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "532", - "endColumns": "56", - "endOffsets": "584" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186", - "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": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", - "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "589,641,694,747,799", - "endColumns": "51,52,52,51,51", - "endOffsets": "636,689,742,794,846" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,412", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "407,527" - } - }, - { - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203", - "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": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json deleted file mode 100644 index e26460c2..00000000 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ /dev/null @@ -1,382 +0,0 @@ -[ - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\xml\\preferences.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_edit.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\widget_2x.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\settings_header.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\sub_folder.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_list.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\note_edit.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\raw\\introduction" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\add_account_text.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\note_list.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\xml\\searchable.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable\\new_note.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\note_list_options.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\note_item.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\layout\\widget_4x.xml" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" - }, - { - "merged": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat", - "source": "C:\\Users\\ROG\\StudioProjects\\Notes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" - } -] \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index dabe1f40..9600ff55 100644 --- a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -36,14 +36,14 @@ + android:label="@string/app_name" + android:testOnly="true" > diff --git a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 09331e0a..3f1fb3fc 100644 Binary files a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar deleted file mode 100644 index 0d5f1770..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex deleted file mode 100644 index f29c886c..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex deleted file mode 100644 index e5c7d097..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex deleted file mode 100644 index d8ec2c4e..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex deleted file mode 100644 index 983f3641..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex deleted file mode 100644 index eceecda1..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex deleted file mode 100644 index e32f11d3..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex deleted file mode 100644 index 2f5ecfbd..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex deleted file mode 100644 index e9e44c02..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex deleted file mode 100644 index 3fe4a9be..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex deleted file mode 100644 index ea6f71e5..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex deleted file mode 100644 index fe6429fb..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex deleted file mode 100644 index ce7cad2d..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex deleted file mode 100644 index d97427cd..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex deleted file mode 100644 index f5f59095..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex deleted file mode 100644 index 72f7f194..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex deleted file mode 100644 index 99b707a9..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex deleted file mode 100644 index 3367df57..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex deleted file mode 100644 index 3864095a..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex deleted file mode 100644 index ae8724a5..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex deleted file mode 100644 index 712003ff..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex deleted file mode 100644 index 3229f07e..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex deleted file mode 100644 index 541b041e..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex deleted file mode 100644 index 24a8789f..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex deleted file mode 100644 index 7ac06892..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex deleted file mode 100644 index bc7ec41d..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex deleted file mode 100644 index 71af18e2..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex deleted file mode 100644 index 3d1900e8..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex deleted file mode 100644 index eb6b38fe..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex deleted file mode 100644 index 21155697..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex deleted file mode 100644 index 414b538b..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex deleted file mode 100644 index 1885fff3..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex deleted file mode 100644 index 1107ccc2..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex deleted file mode 100644 index 341cb7a9..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex deleted file mode 100644 index 144cf9c1..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex deleted file mode 100644 index ffbb9b01..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex deleted file mode 100644 index b6a3528e..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex deleted file mode 100644 index ae6e2a4d..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex deleted file mode 100644 index 869e07ce..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex deleted file mode 100644 index f67c6400..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex deleted file mode 100644 index 1de43734..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex deleted file mode 100644 index 525fa4ff..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex deleted file mode 100644 index 261b9bcb..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex deleted file mode 100644 index 238447e0..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex deleted file mode 100644 index bb825ba8..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex deleted file mode 100644 index bf17cb14..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex deleted file mode 100644 index b3346ee8..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex deleted file mode 100644 index 5d89d104..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex deleted file mode 100644 index 0b491838..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex deleted file mode 100644 index eaa76502..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex deleted file mode 100644 index fea922e0..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex deleted file mode 100644 index f9e26182..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex deleted file mode 100644 index 8f6696da..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex deleted file mode 100644 index 63acb0de..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex deleted file mode 100644 index dca62bfd..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex deleted file mode 100644 index d339f978..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex deleted file mode 100644 index 4d23f7ec..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex deleted file mode 100644 index 213abb6d..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex deleted file mode 100644 index 91b250c7..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex deleted file mode 100644 index 60573ff5..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex deleted file mode 100644 index c7caa5b7..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex deleted file mode 100644 index d2b4e3eb..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex deleted file mode 100644 index c5e61130..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex deleted file mode 100644 index c94758c6..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex deleted file mode 100644 index 5e2cb532..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex deleted file mode 100644 index 824e3940..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex deleted file mode 100644 index 68ded968..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex deleted file mode 100644 index 67e16703..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex deleted file mode 100644 index bcac2ec1..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex deleted file mode 100644 index d5110961..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex deleted file mode 100644 index c2253695..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex deleted file mode 100644 index 8a40d272..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex deleted file mode 100644 index 2aa9d47f..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex deleted file mode 100644 index e75d7831..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex deleted file mode 100644 index 42865907..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex deleted file mode 100644 index eb9700e7..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex deleted file mode 100644 index 0c3d6352..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex deleted file mode 100644 index 48c303ec..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex deleted file mode 100644 index ee10b63c..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex deleted file mode 100644 index 1a8c370e..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex deleted file mode 100644 index c9d8d947..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex deleted file mode 100644 index 872685da..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex deleted file mode 100644 index 311f4870..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex deleted file mode 100644 index d38040f8..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex deleted file mode 100644 index d1518625..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex deleted file mode 100644 index 631e973d..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex deleted file mode 100644 index e15a061c..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex deleted file mode 100644 index 3c7c3d53..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex deleted file mode 100644 index 0883a78b..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex deleted file mode 100644 index a4132a8a..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex deleted file mode 100644 index 9dcc1b59..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex deleted file mode 100644 index 4436b286..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex deleted file mode 100644 index 371948e4..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex deleted file mode 100644 index da80f063..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex deleted file mode 100644 index 1ef790d2..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex deleted file mode 100644 index 9c2fd318..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex deleted file mode 100644 index 995370fc..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex deleted file mode 100644 index 73f61001..00000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt index 00d6e91b..b9ccf010 100644 --- a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -74,87 +74,79 @@ 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 id account_dialog_subtitle 0x7f050000 -int id account_dialog_title 0x7f050001 -int id action_select_all 0x7f050002 -int id amPm 0x7f050003 -int id btn_new_note 0x7f050004 -int id btn_set_bg_color 0x7f050005 -int id cb_edit_item 0x7f050006 -int id date 0x7f050007 -int id delete 0x7f050008 -int id et_edit_text 0x7f050009 -int id et_foler_name 0x7f05000a -int id font_size_selector 0x7f05000b -int id hour 0x7f05000c -int id iv_alert_icon 0x7f05000d -int id iv_bg_blue 0x7f05000e -int id iv_bg_blue_select 0x7f05000f -int id iv_bg_green 0x7f050010 -int id iv_bg_green_select 0x7f050011 -int id iv_bg_red 0x7f050012 -int id iv_bg_red_select 0x7f050013 -int id iv_bg_white 0x7f050014 -int id iv_bg_white_select 0x7f050015 -int id iv_bg_yellow 0x7f050016 -int id iv_bg_yellow_select 0x7f050017 -int id iv_large_select 0x7f050018 -int id iv_medium_select 0x7f050019 -int id iv_small_select 0x7f05001a -int id iv_super_select 0x7f05001b -int id ll_font_large 0x7f05001c -int id ll_font_normal 0x7f05001d -int id ll_font_small 0x7f05001e -int id ll_font_super 0x7f05001f -int id menu_alert 0x7f050020 -int id menu_delete 0x7f050021 -int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050023 -int id menu_font_size 0x7f050024 -int id menu_list_mode 0x7f050025 -int id menu_new_folder 0x7f050026 -int id menu_new_note 0x7f050027 -int id menu_search 0x7f050028 -int id menu_send_to_desktop 0x7f050029 -int id menu_setting 0x7f05002a -int id menu_share 0x7f05002b -int id menu_sync 0x7f05002c -int id minute 0x7f05002d -int id move 0x7f05002e -int id navigation_bar 0x7f05002f -int id note_bg_color_selector 0x7f050030 -int id note_edit_list 0x7f050031 -int id note_edit_view 0x7f050032 -int id note_item 0x7f050033 -int id note_title 0x7f050034 -int id notes_list 0x7f050035 -int id prefenerece_sync_status_textview 0x7f050036 -int id preference_sync_button 0x7f050037 -int id selection_menu 0x7f050038 -int id sv_note_edit 0x7f050039 -int id tv_alert_date 0x7f05003a -int id tv_folder_name 0x7f05003b -int id tv_modified_date 0x7f05003c -int id tv_name 0x7f05003d -int id tv_time 0x7f05003e -int id tv_title 0x7f05003f -int id tv_title_bar 0x7f050040 -int id widget_bg_image 0x7f050041 -int id widget_text 0x7f050042 -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 id action_select_all 0x7f050000 +int id amPm 0x7f050001 +int id btn_new_note 0x7f050002 +int id btn_set_bg_color 0x7f050003 +int id cb_edit_item 0x7f050004 +int id date 0x7f050005 +int id delete 0x7f050006 +int id et_edit_text 0x7f050007 +int id et_foler_name 0x7f050008 +int id font_size_selector 0x7f050009 +int id hour 0x7f05000a +int id iv_alert_icon 0x7f05000b +int id iv_bg_blue 0x7f05000c +int id iv_bg_blue_select 0x7f05000d +int id iv_bg_green 0x7f05000e +int id iv_bg_green_select 0x7f05000f +int id iv_bg_red 0x7f050010 +int id iv_bg_red_select 0x7f050011 +int id iv_bg_white 0x7f050012 +int id iv_bg_white_select 0x7f050013 +int id iv_bg_yellow 0x7f050014 +int id iv_bg_yellow_select 0x7f050015 +int id iv_large_select 0x7f050016 +int id iv_medium_select 0x7f050017 +int id iv_small_select 0x7f050018 +int id iv_super_select 0x7f050019 +int id ll_font_large 0x7f05001a +int id ll_font_normal 0x7f05001b +int id ll_font_small 0x7f05001c +int id ll_font_super 0x7f05001d +int id menu_alert 0x7f05001e +int id menu_delete 0x7f05001f +int id menu_delete_remind 0x7f050020 +int id menu_export_text 0x7f050021 +int id menu_font_size 0x7f050022 +int id menu_list_mode 0x7f050023 +int id menu_new_folder 0x7f050024 +int id menu_new_note 0x7f050025 +int id menu_search 0x7f050026 +int id menu_send_to_desktop 0x7f050027 +int id menu_setting 0x7f050028 +int id menu_share 0x7f050029 +int id minute 0x7f05002a +int id move 0x7f05002b +int id navigation_bar 0x7f05002c +int id note_bg_color_selector 0x7f05002d +int id note_edit_list 0x7f05002e +int id note_edit_view 0x7f05002f +int id note_item 0x7f050030 +int id note_title 0x7f050031 +int id notes_list 0x7f050032 +int id selection_menu 0x7f050033 +int id sv_note_edit 0x7f050034 +int id tv_alert_date 0x7f050035 +int id tv_folder_name 0x7f050036 +int id tv_modified_date 0x7f050037 +int id tv_name 0x7f050038 +int id tv_time 0x7f050039 +int id tv_title 0x7f05003a +int id tv_title_bar 0x7f05003b +int id widget_bg_image 0x7f05003c +int id widget_text 0x7f05003d +int layout datetime_picker 0x7f060000 +int layout dialog_edit_text 0x7f060001 +int layout folder_list_item 0x7f060002 +int layout note_edit 0x7f060003 +int layout note_edit_list_item 0x7f060004 +int layout note_item 0x7f060005 +int layout note_list 0x7f060006 +int layout note_list_dropdown_menu 0x7f060007 +int layout note_list_footer 0x7f060008 +int layout widget_2x 0x7f060009 +int layout widget_4x 0x7f06000a int menu call_note_edit 0x7f070000 int menu call_record_folder 0x7f070001 int menu note_edit 0x7f070002 diff --git a/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json index bb4deaa8..51f6368b 100644 --- a/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ b/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json @@ -1 +1 @@ -{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file +{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt new file mode 100644 index 00000000..8c085289 --- /dev/null +++ b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -0,0 +1,275 @@ +net.micode.notes:xml/searchable = 0x7f0c0001 +net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 +net.micode.notes:style/NoteTheme = 0x7f0b0003 +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 +net.micode.notes:string/ticker_syncing = 0x7f0a0063 +net.micode.notes:string/ticker_success = 0x7f0a0062 +net.micode.notes:string/ticker_fail = 0x7f0a0061 +net.micode.notes:string/ticker_cancel = 0x7f0a0060 +net.micode.notes:string/sync_progress_login = 0x7f0a005e +net.micode.notes:string/success_sdcard_export = 0x7f0a005b +net.micode.notes:string/set_remind_time_message = 0x7f0a005a +net.micode.notes:string/search_hint = 0x7f0a0057 +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:string/preferences_menu_change_account = 0x7f0a0051 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 +net.micode.notes:string/preferences_add_account = 0x7f0a0046 +net.micode.notes:string/preferences_account_title = 0x7f0a0045 +net.micode.notes:string/preferences_account_summary = 0x7f0a0044 +net.micode.notes:string/widget_havenot_content = 0x7f0a0064 +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/sync_progress_init_list = 0x7f0a005d +net.micode.notes:string/note_link_tel = 0x7f0a003e +net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:string/note_alert_expired = 0x7f0a003b +net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:string/menu_share = 0x7f0a0037 +net.micode.notes:string/menu_setting = 0x7f0a0036 +net.micode.notes:string/menu_select_title = 0x7f0a0034 +net.micode.notes:string/menu_select_none = 0x7f0a0033 +net.micode.notes:string/menu_select_all = 0x7f0a0032 +net.micode.notes:string/menu_list_mode = 0x7f0a002c +net.micode.notes:string/menu_font_super = 0x7f0a002b +net.micode.notes:string/menu_font_size = 0x7f0a0029 +net.micode.notes:string/menu_font_normal = 0x7f0a0028 +net.micode.notes:string/menu_font_large = 0x7f0a0027 +net.micode.notes:drawable/font_super = 0x7f040014 +net.micode.notes:layout/note_list = 0x7f060006 +net.micode.notes:string/menu_folder_view = 0x7f0a0026 +net.micode.notes:string/menu_title_select_folder = 0x7f0a003a +net.micode.notes:drawable/clock = 0x7f040003 +net.micode.notes:string/menu_folder_delete = 0x7f0a0025 +net.micode.notes:id/sv_note_edit = 0x7f050034 +net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 +net.micode.notes:string/search = 0x7f0a0056 +net.micode.notes:id/font_size_selector = 0x7f050009 +net.micode.notes:string/menu_deselect_all = 0x7f0a0022 +net.micode.notes:string/hint_foler_name = 0x7f0a001d +net.micode.notes:string/format_folder_files_count = 0x7f0a001b +net.micode.notes:string/file_path = 0x7f0a0016 +net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 +net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 +net.micode.notes:string/error_sync_internal = 0x7f0a0012 +net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 +net.micode.notes:string/menu_create_folder = 0x7f0a0020 +net.micode.notes:string/error_sdcard_export = 0x7f0a000f +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a +net.micode.notes:string/button_delete = 0x7f0a0007 +net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 +net.micode.notes:id/move = 0x7f05002b +net.micode.notes:raw/introduction = 0x7f090000 +net.micode.notes:drawable/list_blue_down = 0x7f040017 +net.micode.notes:id/iv_bg_red = 0x7f050010 +net.micode.notes:drawable/list_yellow_middle = 0x7f04002a +net.micode.notes:id/widget_bg_image = 0x7f05003c +net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c +net.micode.notes:menu/note_list_options = 0x7f070005 +net.micode.notes:menu/note_list = 0x7f070003 +net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:string/app_name = 0x7f0a0004 +net.micode.notes:layout/widget_4x = 0x7f06000a +net.micode.notes:layout/folder_list_item = 0x7f060002 +net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:id/menu_share = 0x7f050029 +net.micode.notes:string/app_widget4x4 = 0x7f0a0006 +net.micode.notes:menu/call_record_folder = 0x7f070001 +net.micode.notes:id/tv_name = 0x7f050038 +net.micode.notes:layout/note_item = 0x7f060005 +net.micode.notes:string/menu_alert = 0x7f0a001f +net.micode.notes:dimen/text_font_size_normal = 0x7f030002 +net.micode.notes:layout/note_edit_list_item = 0x7f060004 +net.micode.notes:layout/datetime_picker = 0x7f060000 +net.micode.notes:id/widget_text = 0x7f05003d +net.micode.notes:menu/note_list_dropdown = 0x7f070004 +net.micode.notes:id/iv_bg_blue_select = 0x7f05000d +net.micode.notes:id/tv_title_bar = 0x7f05003b +net.micode.notes:id/tv_folder_name = 0x7f050036 +net.micode.notes:id/tv_alert_date = 0x7f050035 +net.micode.notes:id/selection_menu = 0x7f050033 +net.micode.notes:layout/note_list_dropdown_menu = 0x7f060007 +net.micode.notes:id/ll_font_super = 0x7f05001d +net.micode.notes:string/format_date_ymd = 0x7f0a0018 +net.micode.notes:id/iv_bg_yellow_select = 0x7f050015 +net.micode.notes:id/note_edit_view = 0x7f05002f +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d +net.micode.notes:drawable/font_small = 0x7f040013 +net.micode.notes:id/note_bg_color_selector = 0x7f05002d +net.micode.notes:id/navigation_bar = 0x7f05002c +net.micode.notes:id/ll_font_normal = 0x7f05001b +net.micode.notes:id/minute = 0x7f05002a +net.micode.notes:string/file_name_txt_format = 0x7f0a0015 +net.micode.notes:color/primary_text_dark = 0x7f020000 +net.micode.notes:id/menu_setting = 0x7f050028 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 +net.micode.notes:id/menu_search = 0x7f050026 +net.micode.notes:id/menu_new_note = 0x7f050025 +net.micode.notes:id/menu_new_folder = 0x7f050024 +net.micode.notes:layout/note_list_footer = 0x7f060008 +net.micode.notes:id/iv_bg_green = 0x7f05000e +net.micode.notes:id/tv_time = 0x7f050039 +net.micode.notes:id/menu_alert = 0x7f05001e +net.micode.notes:id/et_foler_name = 0x7f050008 +net.micode.notes:id/ll_font_small = 0x7f05001c +net.micode.notes:id/iv_super_select = 0x7f050019 +net.micode.notes:drawable/widget_2x_white = 0x7f04003b +net.micode.notes:id/iv_medium_select = 0x7f050017 +net.micode.notes:id/iv_large_select = 0x7f050016 +net.micode.notes:id/notes_list = 0x7f050032 +net.micode.notes:id/btn_set_bg_color = 0x7f050003 +net.micode.notes:id/et_edit_text = 0x7f050007 +net.micode.notes:id/iv_bg_red_select = 0x7f050011 +net.micode.notes:id/iv_bg_yellow = 0x7f050014 +net.micode.notes:string/sync_progress_syncing = 0x7f0a005f +net.micode.notes:drawable/list_blue_middle = 0x7f040018 +net.micode.notes:drawable/font_normal = 0x7f040011 +net.micode.notes:drawable/list_blue_up = 0x7f04001a +net.micode.notes:id/date = 0x7f050005 +net.micode.notes:id/menu_delete_remind = 0x7f050020 +net.micode.notes:drawable/list_yellow_single = 0x7f04002b +net.micode.notes:id/amPm = 0x7f050001 +net.micode.notes:string/menu_move = 0x7f0a002d +net.micode.notes:id/action_select_all = 0x7f050000 +net.micode.notes:drawable/new_note_pressed = 0x7f040031 +net.micode.notes:layout/dialog_edit_text = 0x7f060001 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 +net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 +net.micode.notes:drawable/widget_4x_white = 0x7f040040 +net.micode.notes:id/ll_font_large = 0x7f05001a +net.micode.notes:drawable/list_red_single = 0x7f040023 +net.micode.notes:drawable/edit_blue = 0x7f040006 +net.micode.notes:drawable/widget_4x_red = 0x7f04003f +net.micode.notes:string/note_link_other = 0x7f0a003d +net.micode.notes:string/folder_exist = 0x7f0a0017 +net.micode.notes:drawable/widget_2x_green = 0x7f040039 +net.micode.notes:drawable/title_alert = 0x7f040036 +net.micode.notes:drawable/widget_2x_blue = 0x7f040038 +net.micode.notes:drawable/widget_4x_green = 0x7f04003e +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c +net.micode.notes:drawable/list_white_down = 0x7f040025 +net.micode.notes:drawable/dropdown_icon = 0x7f040005 +net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e +net.micode.notes:drawable/new_note_normal = 0x7f040030 +net.micode.notes:drawable/list_background = 0x7f040016 +net.micode.notes:string/menu_delete = 0x7f0a0021 +net.micode.notes:drawable/list_red_up = 0x7f040024 +net.micode.notes:id/iv_bg_white_select = 0x7f050013 +net.micode.notes:id/menu_send_to_desktop = 0x7f050027 +net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 +net.micode.notes:drawable/new_note = 0x7f04002f +net.micode.notes:drawable/edit_title_white = 0x7f04000c +net.micode.notes:drawable/menu_delete = 0x7f04002d +net.micode.notes:id/cb_edit_item = 0x7f050004 +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 +net.micode.notes:drawable/list_yellow_up = 0x7f04002c +net.micode.notes:drawable/widget_2x_red = 0x7f04003a +net.micode.notes:id/note_edit_list = 0x7f05002e +net.micode.notes:drawable/list_yellow_down = 0x7f040029 +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:drawable/selected = 0x7f040035 +net.micode.notes:drawable/list_white_middle = 0x7f040026 +net.micode.notes:drawable/edit_title_yellow = 0x7f04000d +net.micode.notes:layout/note_edit = 0x7f060003 +net.micode.notes:id/hour = 0x7f05000a +net.micode.notes:xml/preferences = 0x7f0c0000 +net.micode.notes:id/menu_export_text = 0x7f050021 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 +net.micode.notes:drawable/list_red_down = 0x7f040021 +net.micode.notes:string/error_note_not_exist = 0x7f0a000e +net.micode.notes:array/menu_share_ways = 0x7f010001 +net.micode.notes:id/iv_bg_green_select = 0x7f05000f +net.micode.notes:id/menu_font_size = 0x7f050022 +net.micode.notes:id/iv_bg_blue = 0x7f05000c +net.micode.notes:drawable/list_green_middle = 0x7f04001e +net.micode.notes:drawable/list_footer_bg = 0x7f04001c +net.micode.notes:drawable/list_white_single = 0x7f040027 +net.micode.notes:drawable/list_white_up = 0x7f040028 +net.micode.notes:string/menu_remove_remind = 0x7f0a0030 +net.micode.notes:drawable/list_green_down = 0x7f04001d +net.micode.notes:layout/widget_2x = 0x7f060009 +net.micode.notes:id/note_item = 0x7f050030 +net.micode.notes:dimen/text_font_size_super = 0x7f030004 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 +net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 +net.micode.notes:id/menu_delete = 0x7f05001f +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d +net.micode.notes:drawable/list_green_up = 0x7f040020 +net.micode.notes:drawable/icon_app = 0x7f040015 +net.micode.notes:drawable/edit_yellow = 0x7f04000f +net.micode.notes:drawable/list_blue_single = 0x7f040019 +net.micode.notes:drawable/list_red_middle = 0x7f040022 +net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:drawable/edit_title_blue = 0x7f040009 +net.micode.notes:drawable/title_bar_bg = 0x7f040037 +net.micode.notes:id/delete = 0x7f050006 +net.micode.notes:drawable/search_result = 0x7f040034 +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 +net.micode.notes:id/tv_modified_date = 0x7f050037 +net.micode.notes:string/menu_font_small = 0x7f0a002a +net.micode.notes:drawable/font_large = 0x7f040010 +net.micode.notes:id/iv_alert_icon = 0x7f05000b +net.micode.notes:drawable/list_green_single = 0x7f04001f +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:drawable/edit_white = 0x7f04000e +net.micode.notes:string/search_label = 0x7f0a0058 +net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:drawable/menu_move = 0x7f04002e +net.micode.notes:id/btn_new_note = 0x7f050002 +net.micode.notes:drawable/edit_title_red = 0x7f04000b +net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 +net.micode.notes:string/search_setting_description = 0x7f0a0059 +net.micode.notes:id/menu_list_mode = 0x7f050023 +net.micode.notes:dimen/text_font_size_medium = 0x7f030001 +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 +net.micode.notes:drawable/list_folder = 0x7f04001b +net.micode.notes:id/iv_small_select = 0x7f050018 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 +net.micode.notes:color/user_query_highlight = 0x7f020002 +net.micode.notes:drawable/edit_red = 0x7f040008 +net.micode.notes:drawable/edit_green = 0x7f040007 +net.micode.notes:string/app_widget2x2 = 0x7f0a0005 +net.micode.notes:id/tv_title = 0x7f05003a +net.micode.notes:drawable/delete = 0x7f040004 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:string/error_sync_network = 0x7f0a0013 +net.micode.notes:drawable/edit_title_green = 0x7f04000a +net.micode.notes:drawable/widget_4x_blue = 0x7f04003d +net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 +net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 +net.micode.notes:dimen/text_font_size_large = 0x7f030000 +net.micode.notes:string/delete_remind_time_message = 0x7f0a000b +net.micode.notes:dimen/text_font_size_small = 0x7f030003 +net.micode.notes:string/menu_export_text = 0x7f0a0023 +net.micode.notes:drawable/call_record = 0x7f040002 +net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e +net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 +net.micode.notes:drawable/notification = 0x7f040033 +net.micode.notes:color/secondary_text_dark = 0x7f020001 +net.micode.notes:string/menu_search = 0x7f0a0031 +net.micode.notes:string/alert_title_delete = 0x7f0a0003 +net.micode.notes:string/success_sync_account = 0x7f0a005c +net.micode.notes:id/iv_bg_white = 0x7f050012 +net.micode.notes:id/note_title = 0x7f050031 +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 +net.micode.notes:array/format_for_exported_note = 0x7f010000 diff --git a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk deleted file mode 100644 index e93e8ea4..00000000 Binary files a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk and /dev/null differ diff --git a/src/Notes-master/app/build/outputs/apk/debug/output-metadata.json b/src/Notes-master/app/build/outputs/apk/debug/output-metadata.json deleted file mode 100644 index b2231b9c..00000000 --- a/src/Notes-master/app/build/outputs/apk/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "app-debug.apk" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt index fd5a9f61..e2fcb8b4 100644 --- a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,235 +1,237 @@ -- Merging decision tree log --- manifest -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:18:1-152:12 package - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml android:versionName - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml + xmlns:tools + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:19:5-51 xmlns:android - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:23:5-81 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:24:5-81 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:23:22-78 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:24:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:24:5-88 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:25:5-88 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:24:22-85 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:25:22-85 uses-permission#android.permission.INTERNET -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:25:5-67 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:26:5-67 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:25:22-64 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:26:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:26:5-72 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:27:5-72 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:26:22-69 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:27:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:27:5-74 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:28:5-74 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:27:22-71 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:28:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:28:5-80 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:29:5-80 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:28:22-77 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:29:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:29:5-71 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:30:5-71 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:29:22-68 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:30:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:30:5-74 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:31:5-74 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:30:22-71 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:31:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:31:5-81 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:32:5-81 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:31:22-78 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:32:22-78 application -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:33:5-147:19 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:34:5-151:19 android:label - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:9-41 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:36:9-41 android:icon - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:34:9-42 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:35:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:36:9-49:20 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:37:9-52:20 android:label - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:39:13-45 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:40:13-45 android:launchMode - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:40:13-43 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:41:13-43 android:windowSoftInputMode - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:43:13-52 - android:uiOptions - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:42:13-57 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:46:13-52 android:configChanges - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:38:13-74 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:39:13-74 android:theme - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:42:13-45 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:37:13-49 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:38:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:45:13-48:29 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:48:13-51:29 action#android.intent.action.MAIN -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:46:17-69 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:49:17-69 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:46:25-66 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:49:25-66 category#android.intent.category.LAUNCHER -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:47:17-77 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:50:17-77 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:47:27-74 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:50:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:51:9-79:20 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:54:9-82:20 android:launchMode - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:54:13-43 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:57:13-43 android:configChanges - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:53:13-74 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:56:13-74 android:theme - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:55:13-45 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:58:13-45 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:52:13-48 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:55: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 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:57:13-62:29 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:60:13-65:29 action#android.intent.action.VIEW -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:58:17-69 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:61:17-69 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:58:25-66 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:61:25-66 category#android.intent.category.DEFAULT -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:17-76 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:62:17-76 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:27-73 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:62:27-73 data -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:17-78 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:63:17-78 android:mimeType - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:23-75 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:63: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 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:64:13-69:29 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:67:13-72:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:65:17-79 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:68:17-79 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:65:25-76 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:68:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:71:13-74:29 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:74:13-77:29 action#android.intent.action.SEARCH -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:72:17-71 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:75:17-71 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:72:25-68 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:75:25-68 meta-data#android.app.searchable -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:76:13-78:54 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:79:13-81:54 android:resource - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:78:17-51 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:81:17-51 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:77:17-54 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:80:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:81:9-84:43 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:84:9-87:43 android:authorities - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:83:13-47 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:86:13-47 android:multiprocess - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:84:13-40 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:87:13-40 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:82:13-63 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:85:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:86:9-98:20 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:89:9-101:20 android:label - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:88:13-50 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:91:13-50 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:87:13-57 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:90: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 C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:89:13-93:29 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:92:13-96:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:90:17-84 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:93:17-84 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:90:25-81 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:93:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:91:17-85 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:91:25-82 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:95:17-85 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:95:25-82 meta-data#android.appwidget.provider -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:95:13-97:58 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:98:13-100:58 android:resource - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:97:17-55 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:100:17-55 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:96:17-58 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:99:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:99:9-112:20 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:102:9-115:20 android:label - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:101:13-50 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:104:13-50 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:100:13-57 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:103:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:114:9-118:20 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:117:9-121:20 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:114:19-55 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:117:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:115:13-117:29 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:118:13-120:29 action#android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:116:17-79 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:119:17-79 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:116:25-76 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:119:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:120:9-123:20 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:123:9-126:20 android:process - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:122:13-38 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:125:13-38 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:121:13-61 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:124:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:125:9-130:20 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:128:9-133:20 android:label - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:127:13-45 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:130:13-45 android:launchMode - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:128:13-48 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:131:13-48 android:theme - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:129:13-75 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:132:13-75 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:126:13-50 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:129:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:132:9-137:20 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:135:9-140:20 android:label - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:134:13-54 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:137:13-54 android:launchMode - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:135:13-43 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:138:13-43 android:theme - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:136:13-60 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:139:13-60 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:133:13-71 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:136:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:139:9-142:19 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:142:9-146:19 android:exported - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:13-37 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:144:13-37 + tools:ignore + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:145:13-40 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:140:13-74 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:143:13-74 meta-data#android.app.default_searchable -ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:144:9-146:52 +ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:148:9-150:52 android:value - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:13-49 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:150:13-49 android:name - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:145:13-58 + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml:149:13-58 uses-sdk -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml -INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml +INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml android:targetSdkVersion - INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml android:minSdkVersion - INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml - ADDED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\ROG\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml + ADDED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\ROG\Desktop\Notes-master\app\src\main\AndroidManifest.xml diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt index 18fb14ec..585d8853 100644 --- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt +++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt @@ -1,7 +1,3 @@ -net/micode/notes/gtask/remote/GTaskManager.java - net.micode.notes.gtask.remote.GTaskManager -net/micode/notes/gtask/remote/GTaskClient.java - net.micode.notes.gtask.remote.GTaskClient net/micode/notes/model/WorkingNote.java net.micode.notes.model.WorkingNote net.micode.notes.model.WorkingNote$NoteSettingChangedListener @@ -20,10 +16,6 @@ net/micode/notes/ui/DateTimePickerDialog.java net.micode.notes.ui.DateTimePickerDialog net.micode.notes.ui.DateTimePickerDialog$1 net.micode.notes.ui.DateTimePickerDialog$OnDateTimeSetListener -net/micode/notes/gtask/remote/GTaskASyncTask.java - net.micode.notes.gtask.remote.GTaskASyncTask - net.micode.notes.gtask.remote.GTaskASyncTask$1 - net.micode.notes.gtask.remote.GTaskASyncTask$OnCompleteListener net/micode/notes/data/Notes.java net.micode.notes.data.Notes net.micode.notes.data.Notes$CallNote @@ -53,9 +45,6 @@ net/micode/notes/ui/NotesPreferenceActivity.java net.micode.notes.ui.NotesPreferenceActivity$3 net.micode.notes.ui.NotesPreferenceActivity$4 net.micode.notes.ui.NotesPreferenceActivity$5 - net.micode.notes.ui.NotesPreferenceActivity$6 - net.micode.notes.ui.NotesPreferenceActivity$7 - net.micode.notes.ui.NotesPreferenceActivity$8 net.micode.notes.ui.NotesPreferenceActivity$GTaskReceiver net/micode/notes/gtask/exception/NetworkFailureException.java net.micode.notes.gtask.exception.NetworkFailureException @@ -84,9 +73,6 @@ net/micode/notes/widget/NoteWidgetProvider_2x.java net/micode/notes/ui/DropdownMenu.java net.micode.notes.ui.DropdownMenu net.micode.notes.ui.DropdownMenu$1 -net/micode/notes/gtask/remote/GTaskSyncService.java - net.micode.notes.gtask.remote.GTaskSyncService - net.micode.notes.gtask.remote.GTaskSyncService$1 net/micode/notes/ui/NotesListAdapter.java net.micode.notes.ui.NotesListAdapter net.micode.notes.ui.NotesListAdapter$AppWidgetAttribute diff --git a/src/Notes-master/app/src/main/AndroidManifest.xml b/src/Notes-master/app/src/main/AndroidManifest.xml index 2b772973..ca84af15 100644 --- a/src/Notes-master/app/src/main/AndroidManifest.xml +++ b/src/Notes-master/app/src/main/AndroidManifest.xml @@ -16,6 +16,7 @@ --> @@ -39,7 +40,9 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" + + + android:windowSoftInputMode="adjustPan" > @@ -138,7 +141,8 @@ + android:exported="false" + tools:ignore="MissingClass"> { - - private static int GTASK_SYNC_NOTIFICATION_ID = 5234235; - - public interface OnCompleteListener { - void onComplete(); - } - - private Context mContext; - - private NotificationManager mNotifiManager; - - private GTaskManager mTaskManager; - - private OnCompleteListener mOnCompleteListener; - - public GTaskASyncTask(Context context, OnCompleteListener listener) { - mContext = context; - mOnCompleteListener = listener; - mNotifiManager = (NotificationManager) mContext - .getSystemService(Context.NOTIFICATION_SERVICE); - mTaskManager = GTaskManager.getInstance(); - } - - public void cancelSync() { - mTaskManager.cancelSync(); - } - - public void publishProgess(String message) { - publishProgress(new String[] { - message - }); - } - - private void showNotification(int tickerId, String content) { - Notification notification = new Notification(R.drawable.notification, mContext - .getString(tickerId), System.currentTimeMillis()); - notification.defaults = Notification.DEFAULT_LIGHTS; - notification.flags = Notification.FLAG_AUTO_CANCEL; - PendingIntent pendingIntent; - if (tickerId != R.string.ticker_success) { - pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesPreferenceActivity.class), 0); - - } else { - pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesListActivity.class), 0); - } - notification = new Notification.Builder(mContext) - .setContentIntent(pendingIntent) - .setTicker(mContext.getString(R.string.app_name)) - .setContentTitle(mContext.getString(R.string.app_name)) - .setContentText(content) - .setWhen(System.currentTimeMillis()) - .setSmallIcon(R.drawable.icon_app) - .build(); - notification.icon = R.drawable.icon_app; - mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); - - } - - @Override - protected Integer doInBackground(Void... unused) { - publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity - .getSyncAccountName(mContext))); - return mTaskManager.sync(mContext, this); - } - - @Override - protected void onProgressUpdate(String... progress) { - showNotification(R.string.ticker_syncing, progress[0]); - if (mContext instanceof GTaskSyncService) { - ((GTaskSyncService) mContext).sendBroadcast(progress[0]); - } - } - - @Override - protected void onPostExecute(Integer result) { - if (result == GTaskManager.STATE_SUCCESS) { - showNotification(R.string.ticker_success, mContext.getString( - R.string.success_sync_account, mTaskManager.getSyncAccount())); - NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis()); - } else if (result == GTaskManager.STATE_NETWORK_ERROR) { - showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network)); - } else if (result == GTaskManager.STATE_INTERNAL_ERROR) { - showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal)); - } else if (result == GTaskManager.STATE_SYNC_CANCELLED) { - showNotification(R.string.ticker_cancel, mContext - .getString(R.string.error_sync_cancelled)); - } - if (mOnCompleteListener != null) { - new Thread(new Runnable() { - - public void run() { - mOnCompleteListener.onComplete(); - } - }).start(); - } - } -} diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java deleted file mode 100644 index c67dfdf3..00000000 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java +++ /dev/null @@ -1,585 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.remote; - -import android.accounts.Account; -import android.accounts.AccountManager; -import android.accounts.AccountManagerFuture; -import android.app.Activity; -import android.os.Bundle; -import android.text.TextUtils; -import android.util.Log; - -import net.micode.notes.gtask.data.Node; -import net.micode.notes.gtask.data.Task; -import net.micode.notes.gtask.data.TaskList; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.gtask.exception.NetworkFailureException; -import net.micode.notes.tool.GTaskStringUtils; -import net.micode.notes.ui.NotesPreferenceActivity; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.cookie.Cookie; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.params.HttpParams; -import org.apache.http.params.HttpProtocolParams; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.LinkedList; -import java.util.List; -import java.util.zip.GZIPInputStream; -import java.util.zip.Inflater; -import java.util.zip.InflaterInputStream; - - -public class GTaskClient { - private static final String TAG = GTaskClient.class.getSimpleName(); - - private static final String GTASK_URL = "https://mail.google.com/tasks/"; - - private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig"; - - private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig"; - - private static GTaskClient mInstance = null; - - private DefaultHttpClient mHttpClient; - - private String mGetUrl; - - private String mPostUrl; - - private long mClientVersion; - - private boolean mLoggedin; - - private long mLastLoginTime; - - private int mActionId; - - private Account mAccount; - - private JSONArray mUpdateArray; - - private GTaskClient() { - mHttpClient = null; - mGetUrl = GTASK_GET_URL; - mPostUrl = GTASK_POST_URL; - mClientVersion = -1; - mLoggedin = false; - mLastLoginTime = 0; - mActionId = 1; - mAccount = null; - mUpdateArray = null; - } - - public static synchronized GTaskClient getInstance() { - if (mInstance == null) { - mInstance = new GTaskClient(); - } - return mInstance; - } - - public boolean login(Activity activity) { - // we suppose that the cookie would expire after 5 minutes - // then we need to re-login - final long interval = 1000 * 60 * 5; - if (mLastLoginTime + interval < System.currentTimeMillis()) { - mLoggedin = false; - } - - // need to re-login after account switch - if (mLoggedin - && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity - .getSyncAccountName(activity))) { - mLoggedin = false; - } - - if (mLoggedin) { - Log.d(TAG, "already logged in"); - return true; - } - - mLastLoginTime = System.currentTimeMillis(); - String authToken = loginGoogleAccount(activity, false); - if (authToken == null) { - Log.e(TAG, "login google account failed"); - return false; - } - - // login with custom domain if necessary - if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase() - .endsWith("googlemail.com"))) { - StringBuilder url = new StringBuilder(GTASK_URL).append("a/"); - int index = mAccount.name.indexOf('@') + 1; - String suffix = mAccount.name.substring(index); - url.append(suffix + "/"); - mGetUrl = url.toString() + "ig"; - mPostUrl = url.toString() + "r/ig"; - - if (tryToLoginGtask(activity, authToken)) { - mLoggedin = true; - } - } - - // try to login with google official url - if (!mLoggedin) { - mGetUrl = GTASK_GET_URL; - mPostUrl = GTASK_POST_URL; - if (!tryToLoginGtask(activity, authToken)) { - return false; - } - } - - mLoggedin = true; - return true; - } - - private String loginGoogleAccount(Activity activity, boolean invalidateToken) { - String authToken; - AccountManager accountManager = AccountManager.get(activity); - Account[] accounts = accountManager.getAccountsByType("com.google"); - - if (accounts.length == 0) { - Log.e(TAG, "there is no available google account"); - return null; - } - - String accountName = NotesPreferenceActivity.getSyncAccountName(activity); - Account account = null; - for (Account a : accounts) { - if (a.name.equals(accountName)) { - account = a; - break; - } - } - if (account != null) { - mAccount = account; - } else { - Log.e(TAG, "unable to get an account with the same name in the settings"); - return null; - } - - // get the token now - AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account, - "goanna_mobile", null, activity, null, null); - try { - Bundle authTokenBundle = accountManagerFuture.getResult(); - authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN); - if (invalidateToken) { - accountManager.invalidateAuthToken("com.google", authToken); - loginGoogleAccount(activity, false); - } - } catch (Exception e) { - Log.e(TAG, "get auth token failed"); - authToken = null; - } - - return authToken; - } - - private boolean tryToLoginGtask(Activity activity, String authToken) { - if (!loginGtask(authToken)) { - // maybe the auth token is out of date, now let's invalidate the - // token and try again - authToken = loginGoogleAccount(activity, true); - if (authToken == null) { - Log.e(TAG, "login google account failed"); - return false; - } - - if (!loginGtask(authToken)) { - Log.e(TAG, "login gtask failed"); - return false; - } - } - return true; - } - - private boolean loginGtask(String authToken) { - int timeoutConnection = 10000; - int timeoutSocket = 15000; - HttpParams httpParameters = new BasicHttpParams(); - HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection); - HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket); - mHttpClient = new DefaultHttpClient(httpParameters); - BasicCookieStore localBasicCookieStore = new BasicCookieStore(); - mHttpClient.setCookieStore(localBasicCookieStore); - HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false); - - // login gtask - try { - String loginUrl = mGetUrl + "?auth=" + authToken; - HttpGet httpGet = new HttpGet(loginUrl); - HttpResponse response = null; - response = mHttpClient.execute(httpGet); - - // get the cookie now - List cookies = mHttpClient.getCookieStore().getCookies(); - boolean hasAuthCookie = false; - for (Cookie cookie : cookies) { - if (cookie.getName().contains("GTL")) { - hasAuthCookie = true; - } - } - if (!hasAuthCookie) { - Log.w(TAG, "it seems that there is no auth cookie"); - } - - // get the client version - String resString = getResponseContent(response.getEntity()); - String jsBegin = "_setup("; - String jsEnd = ")}"; - int begin = resString.indexOf(jsBegin); - int end = resString.lastIndexOf(jsEnd); - String jsString = null; - if (begin != -1 && end != -1 && begin < end) { - jsString = resString.substring(begin + jsBegin.length(), end); - } - JSONObject js = new JSONObject(jsString); - mClientVersion = js.getLong("v"); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return false; - } catch (Exception e) { - // simply catch all exceptions - Log.e(TAG, "httpget gtask_url failed"); - return false; - } - - return true; - } - - private int getActionId() { - return mActionId++; - } - - private HttpPost createHttpPost() { - HttpPost httpPost = new HttpPost(mPostUrl); - httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); - httpPost.setHeader("AT", "1"); - return httpPost; - } - - private String getResponseContent(HttpEntity entity) throws IOException { - String contentEncoding = null; - if (entity.getContentEncoding() != null) { - contentEncoding = entity.getContentEncoding().getValue(); - Log.d(TAG, "encoding: " + contentEncoding); - } - - InputStream input = entity.getContent(); - if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) { - input = new GZIPInputStream(entity.getContent()); - } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) { - Inflater inflater = new Inflater(true); - input = new InflaterInputStream(entity.getContent(), inflater); - } - - try { - InputStreamReader isr = new InputStreamReader(input); - BufferedReader br = new BufferedReader(isr); - StringBuilder sb = new StringBuilder(); - - while (true) { - String buff = br.readLine(); - if (buff == null) { - return sb.toString(); - } - sb = sb.append(buff); - } - } finally { - input.close(); - } - } - - private JSONObject postRequest(JSONObject js) throws NetworkFailureException { - if (!mLoggedin) { - Log.e(TAG, "please login first"); - throw new ActionFailureException("not logged in"); - } - - HttpPost httpPost = createHttpPost(); - try { - LinkedList list = new LinkedList(); - list.add(new BasicNameValuePair("r", js.toString())); - UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8"); - httpPost.setEntity(entity); - - // execute the post - HttpResponse response = mHttpClient.execute(httpPost); - String jsString = getResponseContent(response.getEntity()); - return new JSONObject(jsString); - - } catch (ClientProtocolException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("postRequest failed"); - } catch (IOException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("postRequest failed"); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("unable to convert response content to jsonobject"); - } catch (Exception e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("error occurs when posting request"); - } - } - - public void createTask(Task task) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - - // action_list - actionList.put(task.getCreateAction(getActionId())); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - // post - JSONObject jsResponse = postRequest(jsPost); - JSONObject jsResult = (JSONObject) jsResponse.getJSONArray( - GTaskStringUtils.GTASK_JSON_RESULTS).get(0); - task.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID)); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("create task: handing jsonobject failed"); - } - } - - public void createTaskList(TaskList tasklist) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - - // action_list - actionList.put(tasklist.getCreateAction(getActionId())); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - // post - JSONObject jsResponse = postRequest(jsPost); - JSONObject jsResult = (JSONObject) jsResponse.getJSONArray( - GTaskStringUtils.GTASK_JSON_RESULTS).get(0); - tasklist.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID)); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("create tasklist: handing jsonobject failed"); - } - } - - public void commitUpdate() throws NetworkFailureException { - if (mUpdateArray != null) { - try { - JSONObject jsPost = new JSONObject(); - - // action_list - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, mUpdateArray); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - postRequest(jsPost); - mUpdateArray = null; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("commit update: handing jsonobject failed"); - } - } - } - - public void addUpdateNode(Node node) throws NetworkFailureException { - if (node != null) { - // too many update items may result in an error - // set max to 10 items - if (mUpdateArray != null && mUpdateArray.length() > 10) { - commitUpdate(); - } - - if (mUpdateArray == null) - mUpdateArray = new JSONArray(); - mUpdateArray.put(node.getUpdateAction(getActionId())); - } - } - - public void moveTask(Task task, TaskList preParent, TaskList curParent) - throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - JSONObject action = new JSONObject(); - - // action_list - action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_MOVE); - action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId()); - action.put(GTaskStringUtils.GTASK_JSON_ID, task.getGid()); - if (preParent == curParent && task.getPriorSibling() != null) { - // put prioring_sibing_id only if moving within the tasklist and - // it is not the first one - action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling()); - } - action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid()); - action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid()); - if (preParent != curParent) { - // put the dest_list only if moving between tasklists - action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid()); - } - actionList.put(action); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - postRequest(jsPost); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("move task: handing jsonobject failed"); - } - } - - public void deleteNode(Node node) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - - // action_list - node.setDeleted(true); - actionList.put(node.getUpdateAction(getActionId())); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - postRequest(jsPost); - mUpdateArray = null; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("delete node: handing jsonobject failed"); - } - } - - public JSONArray getTaskLists() throws NetworkFailureException { - if (!mLoggedin) { - Log.e(TAG, "please login first"); - throw new ActionFailureException("not logged in"); - } - - try { - HttpGet httpGet = new HttpGet(mGetUrl); - HttpResponse response = null; - response = mHttpClient.execute(httpGet); - - // get the task list - String resString = getResponseContent(response.getEntity()); - String jsBegin = "_setup("; - String jsEnd = ")}"; - int begin = resString.indexOf(jsBegin); - int end = resString.lastIndexOf(jsEnd); - String jsString = null; - if (begin != -1 && end != -1 && begin < end) { - jsString = resString.substring(begin + jsBegin.length(), end); - } - JSONObject js = new JSONObject(jsString); - return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS); - } catch (ClientProtocolException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("gettasklists: httpget failed"); - } catch (IOException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("gettasklists: httpget failed"); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("get task lists: handing jasonobject failed"); - } - } - - public JSONArray getTaskList(String listGid) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - JSONObject action = new JSONObject(); - - // action_list - action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL); - action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId()); - action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid); - action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false); - actionList.put(action); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - JSONObject jsResponse = postRequest(jsPost); - return jsResponse.getJSONArray(GTaskStringUtils.GTASK_JSON_TASKS); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("get task list: handing jsonobject failed"); - } - } - - public Account getSyncAccount() { - return mAccount; - } - - public void resetUpdateArray() { - mUpdateArray = null; - } -} diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java deleted file mode 100644 index d2b4082b..00000000 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java +++ /dev/null @@ -1,800 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.remote; - -import android.app.Activity; -import android.content.ContentResolver; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.util.Log; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.data.MetaData; -import net.micode.notes.gtask.data.Node; -import net.micode.notes.gtask.data.SqlNote; -import net.micode.notes.gtask.data.Task; -import net.micode.notes.gtask.data.TaskList; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.gtask.exception.NetworkFailureException; -import net.micode.notes.tool.DataUtils; -import net.micode.notes.tool.GTaskStringUtils; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; - - -public class GTaskManager { - private static final String TAG = GTaskManager.class.getSimpleName(); - - public static final int STATE_SUCCESS = 0; - - public static final int STATE_NETWORK_ERROR = 1; - - public static final int STATE_INTERNAL_ERROR = 2; - - public static final int STATE_SYNC_IN_PROGRESS = 3; - - public static final int STATE_SYNC_CANCELLED = 4; - - private static GTaskManager mInstance = null; - - private Activity mActivity; - - private Context mContext; - - private ContentResolver mContentResolver; - - private boolean mSyncing; - - private boolean mCancelled; - - private HashMap mGTaskListHashMap; - - private HashMap mGTaskHashMap; - - private HashMap mMetaHashMap; - - private TaskList mMetaList; - - private HashSet mLocalDeleteIdMap; - - private HashMap mGidToNid; - - private HashMap mNidToGid; - - private GTaskManager() { - mSyncing = false; - mCancelled = false; - mGTaskListHashMap = new HashMap(); - mGTaskHashMap = new HashMap(); - mMetaHashMap = new HashMap(); - mMetaList = null; - mLocalDeleteIdMap = new HashSet(); - mGidToNid = new HashMap(); - mNidToGid = new HashMap(); - } - - public static synchronized GTaskManager getInstance() { - if (mInstance == null) { - mInstance = new GTaskManager(); - } - return mInstance; - } - - public synchronized void setActivityContext(Activity activity) { - // used for getting authtoken - mActivity = activity; - } - - public int sync(Context context, GTaskASyncTask asyncTask) { - if (mSyncing) { - Log.d(TAG, "Sync is in progress"); - return STATE_SYNC_IN_PROGRESS; - } - mContext = context; - mContentResolver = mContext.getContentResolver(); - mSyncing = true; - mCancelled = false; - mGTaskListHashMap.clear(); - mGTaskHashMap.clear(); - mMetaHashMap.clear(); - mLocalDeleteIdMap.clear(); - mGidToNid.clear(); - mNidToGid.clear(); - - try { - GTaskClient client = GTaskClient.getInstance(); - client.resetUpdateArray(); - - // login google task - if (!mCancelled) { - if (!client.login(mActivity)) { - throw new NetworkFailureException("login google task failed"); - } - } - - // get the task list from google - asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list)); - initGTaskList(); - - // do content sync work - asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing)); - syncContent(); - } catch (NetworkFailureException e) { - Log.e(TAG, e.toString()); - return STATE_NETWORK_ERROR; - } catch (ActionFailureException e) { - Log.e(TAG, e.toString()); - return STATE_INTERNAL_ERROR; - } catch (Exception e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return STATE_INTERNAL_ERROR; - } finally { - mGTaskListHashMap.clear(); - mGTaskHashMap.clear(); - mMetaHashMap.clear(); - mLocalDeleteIdMap.clear(); - mGidToNid.clear(); - mNidToGid.clear(); - mSyncing = false; - } - - return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS; - } - - private void initGTaskList() throws NetworkFailureException { - if (mCancelled) - return; - GTaskClient client = GTaskClient.getInstance(); - try { - JSONArray jsTaskLists = client.getTaskLists(); - - // init meta list first - mMetaList = null; - for (int i = 0; i < jsTaskLists.length(); i++) { - JSONObject object = jsTaskLists.getJSONObject(i); - String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); - String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME); - - if (name - .equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) { - mMetaList = new TaskList(); - mMetaList.setContentByRemoteJSON(object); - - // load meta data - JSONArray jsMetas = client.getTaskList(gid); - for (int j = 0; j < jsMetas.length(); j++) { - object = (JSONObject) jsMetas.getJSONObject(j); - MetaData metaData = new MetaData(); - metaData.setContentByRemoteJSON(object); - if (metaData.isWorthSaving()) { - mMetaList.addChildTask(metaData); - if (metaData.getGid() != null) { - mMetaHashMap.put(metaData.getRelatedGid(), metaData); - } - } - } - } - } - - // create meta list if not existed - if (mMetaList == null) { - mMetaList = new TaskList(); - mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_META); - GTaskClient.getInstance().createTaskList(mMetaList); - } - - // init task list - for (int i = 0; i < jsTaskLists.length(); i++) { - JSONObject object = jsTaskLists.getJSONObject(i); - String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); - String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME); - - if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX) - && !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_META)) { - TaskList tasklist = new TaskList(); - tasklist.setContentByRemoteJSON(object); - mGTaskListHashMap.put(gid, tasklist); - mGTaskHashMap.put(gid, tasklist); - - // load tasks - JSONArray jsTasks = client.getTaskList(gid); - for (int j = 0; j < jsTasks.length(); j++) { - object = (JSONObject) jsTasks.getJSONObject(j); - gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); - Task task = new Task(); - task.setContentByRemoteJSON(object); - if (task.isWorthSaving()) { - task.setMetaInfo(mMetaHashMap.get(gid)); - tasklist.addChildTask(task); - mGTaskHashMap.put(gid, task); - } - } - } - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("initGTaskList: handing JSONObject failed"); - } - } - - private void syncContent() throws NetworkFailureException { - int syncType; - Cursor c = null; - String gid; - Node node; - - mLocalDeleteIdMap.clear(); - - if (mCancelled) { - return; - } - - // for local deleted note - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type<>? AND parent_id=?)", new String[] { - String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER) - }, null); - if (c != null) { - while (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c); - } - - mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN)); - } - } else { - Log.w(TAG, "failed to query trash folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // sync folder first - syncFolder(); - - // for note existing in database - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type=? AND parent_id<>?)", new String[] { - String.valueOf(Notes.TYPE_NOTE), String.valueOf(Notes.ID_TRASH_FOLER) - }, NoteColumns.TYPE + " DESC"); - if (c != null) { - while (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); - mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); - syncType = node.getSyncAction(c); - } else { - if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) { - // local add - syncType = Node.SYNC_ACTION_ADD_REMOTE; - } else { - // remote delete - syncType = Node.SYNC_ACTION_DEL_LOCAL; - } - } - doContentSync(syncType, node, c); - } - } else { - Log.w(TAG, "failed to query existing note in database"); - } - - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // go through remaining items - Iterator> iter = mGTaskHashMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = iter.next(); - node = entry.getValue(); - doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); - } - - // mCancelled can be set by another thread, so we neet to check one by - // one - // clear local delete table - if (!mCancelled) { - if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) { - throw new ActionFailureException("failed to batch-delete local deleted notes"); - } - } - - // refresh local sync id - if (!mCancelled) { - GTaskClient.getInstance().commitUpdate(); - refreshLocalSyncId(); - } - - } - - private void syncFolder() throws NetworkFailureException { - Cursor c = null; - String gid; - Node node; - int syncType; - - if (mCancelled) { - return; - } - - // for root folder - try { - c = mContentResolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, - Notes.ID_ROOT_FOLDER), SqlNote.PROJECTION_NOTE, null, null, null); - if (c != null) { - c.moveToNext(); - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER); - mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid); - // for system folder, only update remote name if necessary - if (!node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) - doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c); - } else { - doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c); - } - } else { - Log.w(TAG, "failed to query root folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // for call-note folder - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)", - new String[] { - String.valueOf(Notes.ID_CALL_RECORD_FOLDER) - }, null); - if (c != null) { - if (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER); - mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid); - // for system folder, only update remote name if - // necessary - if (!node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_CALL_NOTE)) - doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c); - } else { - doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c); - } - } - } else { - Log.w(TAG, "failed to query call note folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // for local existing folders - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type=? AND parent_id<>?)", new String[] { - String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER) - }, NoteColumns.TYPE + " DESC"); - if (c != null) { - while (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); - mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); - syncType = node.getSyncAction(c); - } else { - if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) { - // local add - syncType = Node.SYNC_ACTION_ADD_REMOTE; - } else { - // remote delete - syncType = Node.SYNC_ACTION_DEL_LOCAL; - } - } - doContentSync(syncType, node, c); - } - } else { - Log.w(TAG, "failed to query existing folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // for remote add folders - Iterator> iter = mGTaskListHashMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = iter.next(); - gid = entry.getKey(); - node = entry.getValue(); - if (mGTaskHashMap.containsKey(gid)) { - mGTaskHashMap.remove(gid); - doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); - } - } - - if (!mCancelled) - GTaskClient.getInstance().commitUpdate(); - } - - private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - MetaData meta; - switch (syncType) { - case Node.SYNC_ACTION_ADD_LOCAL: - addLocalNode(node); - break; - case Node.SYNC_ACTION_ADD_REMOTE: - addRemoteNode(node, c); - break; - case Node.SYNC_ACTION_DEL_LOCAL: - meta = mMetaHashMap.get(c.getString(SqlNote.GTASK_ID_COLUMN)); - if (meta != null) { - GTaskClient.getInstance().deleteNode(meta); - } - mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN)); - break; - case Node.SYNC_ACTION_DEL_REMOTE: - meta = mMetaHashMap.get(node.getGid()); - if (meta != null) { - GTaskClient.getInstance().deleteNode(meta); - } - GTaskClient.getInstance().deleteNode(node); - break; - case Node.SYNC_ACTION_UPDATE_LOCAL: - updateLocalNode(node, c); - break; - case Node.SYNC_ACTION_UPDATE_REMOTE: - updateRemoteNode(node, c); - break; - case Node.SYNC_ACTION_UPDATE_CONFLICT: - // merging both modifications maybe a good idea - // right now just use local update simply - updateRemoteNode(node, c); - break; - case Node.SYNC_ACTION_NONE: - break; - case Node.SYNC_ACTION_ERROR: - default: - throw new ActionFailureException("unkown sync action type"); - } - } - - private void addLocalNode(Node node) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote; - if (node instanceof TaskList) { - if (node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) { - sqlNote = new SqlNote(mContext, Notes.ID_ROOT_FOLDER); - } else if (node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE)) { - sqlNote = new SqlNote(mContext, Notes.ID_CALL_RECORD_FOLDER); - } else { - sqlNote = new SqlNote(mContext); - sqlNote.setContent(node.getLocalJSONFromContent()); - sqlNote.setParentId(Notes.ID_ROOT_FOLDER); - } - } else { - sqlNote = new SqlNote(mContext); - JSONObject js = node.getLocalJSONFromContent(); - try { - if (js.has(GTaskStringUtils.META_HEAD_NOTE)) { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - if (note.has(NoteColumns.ID)) { - long id = note.getLong(NoteColumns.ID); - if (DataUtils.existInNoteDatabase(mContentResolver, id)) { - // the id is not available, have to create a new one - note.remove(NoteColumns.ID); - } - } - } - - if (js.has(GTaskStringUtils.META_HEAD_DATA)) { - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - if (data.has(DataColumns.ID)) { - long dataId = data.getLong(DataColumns.ID); - if (DataUtils.existInDataDatabase(mContentResolver, dataId)) { - // the data id is not available, have to create - // a new one - data.remove(DataColumns.ID); - } - } - } - - } - } catch (JSONException e) { - Log.w(TAG, e.toString()); - e.printStackTrace(); - } - sqlNote.setContent(js); - - Long parentId = mGidToNid.get(((Task) node).getParent().getGid()); - if (parentId == null) { - Log.e(TAG, "cannot find task's parent id locally"); - throw new ActionFailureException("cannot add local node"); - } - sqlNote.setParentId(parentId.longValue()); - } - - // create the local node - sqlNote.setGtaskId(node.getGid()); - sqlNote.commit(false); - - // update gid-nid mapping - mGidToNid.put(node.getGid(), sqlNote.getId()); - mNidToGid.put(sqlNote.getId(), node.getGid()); - - // update meta - updateRemoteMeta(node.getGid(), sqlNote); - } - - private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote; - // update the note locally - sqlNote = new SqlNote(mContext, c); - sqlNote.setContent(node.getLocalJSONFromContent()); - - Long parentId = (node instanceof Task) ? mGidToNid.get(((Task) node).getParent().getGid()) - : new Long(Notes.ID_ROOT_FOLDER); - if (parentId == null) { - Log.e(TAG, "cannot find task's parent id locally"); - throw new ActionFailureException("cannot update local node"); - } - sqlNote.setParentId(parentId.longValue()); - sqlNote.commit(true); - - // update meta info - updateRemoteMeta(node.getGid(), sqlNote); - } - - private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote = new SqlNote(mContext, c); - Node n; - - // update remotely - if (sqlNote.isNoteType()) { - Task task = new Task(); - task.setContentByLocalJSON(sqlNote.getContent()); - - String parentGid = mNidToGid.get(sqlNote.getParentId()); - if (parentGid == null) { - Log.e(TAG, "cannot find task's parent tasklist"); - throw new ActionFailureException("cannot add remote task"); - } - mGTaskListHashMap.get(parentGid).addChildTask(task); - - GTaskClient.getInstance().createTask(task); - n = (Node) task; - - // add meta - updateRemoteMeta(task.getGid(), sqlNote); - } else { - TaskList tasklist = null; - - // we need to skip folder if it has already existed - String folderName = GTaskStringUtils.MIUI_FOLDER_PREFFIX; - if (sqlNote.getId() == Notes.ID_ROOT_FOLDER) - folderName += GTaskStringUtils.FOLDER_DEFAULT; - else if (sqlNote.getId() == Notes.ID_CALL_RECORD_FOLDER) - folderName += GTaskStringUtils.FOLDER_CALL_NOTE; - else - folderName += sqlNote.getSnippet(); - - Iterator> iter = mGTaskListHashMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = iter.next(); - String gid = entry.getKey(); - TaskList list = entry.getValue(); - - if (list.getName().equals(folderName)) { - tasklist = list; - if (mGTaskHashMap.containsKey(gid)) { - mGTaskHashMap.remove(gid); - } - break; - } - } - - // no match we can add now - if (tasklist == null) { - tasklist = new TaskList(); - tasklist.setContentByLocalJSON(sqlNote.getContent()); - GTaskClient.getInstance().createTaskList(tasklist); - mGTaskListHashMap.put(tasklist.getGid(), tasklist); - } - n = (Node) tasklist; - } - - // update local note - sqlNote.setGtaskId(n.getGid()); - sqlNote.commit(false); - sqlNote.resetLocalModified(); - sqlNote.commit(true); - - // gid-id mapping - mGidToNid.put(n.getGid(), sqlNote.getId()); - mNidToGid.put(sqlNote.getId(), n.getGid()); - } - - private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote = new SqlNote(mContext, c); - - // update remotely - node.setContentByLocalJSON(sqlNote.getContent()); - GTaskClient.getInstance().addUpdateNode(node); - - // update meta - updateRemoteMeta(node.getGid(), sqlNote); - - // move task if necessary - if (sqlNote.isNoteType()) { - Task task = (Task) node; - TaskList preParentList = task.getParent(); - - String curParentGid = mNidToGid.get(sqlNote.getParentId()); - if (curParentGid == null) { - Log.e(TAG, "cannot find task's parent tasklist"); - throw new ActionFailureException("cannot update remote task"); - } - TaskList curParentList = mGTaskListHashMap.get(curParentGid); - - if (preParentList != curParentList) { - preParentList.removeChildTask(task); - curParentList.addChildTask(task); - GTaskClient.getInstance().moveTask(task, preParentList, curParentList); - } - } - - // clear local modified flag - sqlNote.resetLocalModified(); - sqlNote.commit(true); - } - - private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException { - if (sqlNote != null && sqlNote.isNoteType()) { - MetaData metaData = mMetaHashMap.get(gid); - if (metaData != null) { - metaData.setMeta(gid, sqlNote.getContent()); - GTaskClient.getInstance().addUpdateNode(metaData); - } else { - metaData = new MetaData(); - metaData.setMeta(gid, sqlNote.getContent()); - mMetaList.addChildTask(metaData); - mMetaHashMap.put(gid, metaData); - GTaskClient.getInstance().createTask(metaData); - } - } - } - - private void refreshLocalSyncId() throws NetworkFailureException { - if (mCancelled) { - return; - } - - // get the latest gtask list - mGTaskHashMap.clear(); - mGTaskListHashMap.clear(); - mMetaHashMap.clear(); - initGTaskList(); - - Cursor c = null; - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type<>? AND parent_id<>?)", new String[] { - String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER) - }, NoteColumns.TYPE + " DESC"); - if (c != null) { - while (c.moveToNext()) { - String gid = c.getString(SqlNote.GTASK_ID_COLUMN); - Node node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - ContentValues values = new ContentValues(); - values.put(NoteColumns.SYNC_ID, node.getLastModified()); - mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, - c.getLong(SqlNote.ID_COLUMN)), values, null, null); - } else { - Log.e(TAG, "something is missed"); - throw new ActionFailureException( - "some local items don't have gid after sync"); - } - } - } else { - Log.w(TAG, "failed to query local note to refresh sync id"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - } - - public String getSyncAccount() { - return GTaskClient.getInstance().getSyncAccount().name; - } - - public void cancelSync() { - mCancelled = true; - } -} diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java deleted file mode 100644 index cca36f76..00000000 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.remote; - -import android.app.Activity; -import android.app.Service; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.os.IBinder; - -public class GTaskSyncService extends Service { - public final static String ACTION_STRING_NAME = "sync_action_type"; - - public final static int ACTION_START_SYNC = 0; - - public final static int ACTION_CANCEL_SYNC = 1; - - public final static int ACTION_INVALID = 2; - - public final static String GTASK_SERVICE_BROADCAST_NAME = "net.micode.notes.gtask.remote.gtask_sync_service"; - - public final static String GTASK_SERVICE_BROADCAST_IS_SYNCING = "isSyncing"; - - public final static String GTASK_SERVICE_BROADCAST_PROGRESS_MSG = "progressMsg"; - - private static GTaskASyncTask mSyncTask = null; - - private static String mSyncProgress = ""; - - private void startSync() { - if (mSyncTask == null) { - mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() { - public void onComplete() { - mSyncTask = null; - sendBroadcast(""); - stopSelf(); - } - }); - sendBroadcast(""); - mSyncTask.execute(); - } - } - - private void cancelSync() { - if (mSyncTask != null) { - mSyncTask.cancelSync(); - } - } - - @Override - public void onCreate() { - mSyncTask = null; - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - Bundle bundle = intent.getExtras(); - if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) { - switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) { - case ACTION_START_SYNC: - startSync(); - break; - case ACTION_CANCEL_SYNC: - cancelSync(); - break; - default: - break; - } - return START_STICKY; - } - return super.onStartCommand(intent, flags, startId); - } - - @Override - public void onLowMemory() { - if (mSyncTask != null) { - mSyncTask.cancelSync(); - } - } - - public IBinder onBind(Intent intent) { - return null; - } - - public void sendBroadcast(String msg) { - mSyncProgress = msg; - Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME); - intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null); - intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg); - sendBroadcast(intent); - } - - public static void startSync(Activity activity) { - GTaskManager.getInstance().setActivityContext(activity); - Intent intent = new Intent(activity, GTaskSyncService.class); - intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC); - activity.startService(intent); - } - - public static void cancelSync(Context context) { - Intent intent = new Intent(context, GTaskSyncService.class); - intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC); - context.startService(intent); - } - - public static boolean isSyncing() { - return mSyncTask != null; - } - - public static String getProgressString() { - return mSyncProgress; - } -} diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java index 39f6ec47..9e9ed1df 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java @@ -295,8 +295,9 @@ public class BackupUtils { mFileName = file.getName(); mFileDirectory = mContext.getString(R.string.file_path); PrintStream ps = null; + FileOutputStream fos = null; try { - FileOutputStream fos = new FileOutputStream(file); + fos = new FileOutputStream(file); ps = new PrintStream(fos); } catch (FileNotFoundException e) { e.printStackTrace(); @@ -305,6 +306,16 @@ public class BackupUtils { e.printStackTrace(); return null; } + finally {//添加finally代码块关闭输出流 + if(fos != null){ + try{ + fos.close(); + } + catch(IOException e){ + e.printStackTrace(); + } + } + } return ps; } } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java index 2c47ba41..31c820f7 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java @@ -77,7 +77,7 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME; - flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; + flag |= DateUtils.FORMAT_24HOUR;//删除条件判断 setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 96a9ff89..0cf07bdc 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -75,13 +75,13 @@ import java.util.regex.Pattern; public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { private class HeadViewHolder { - public TextView tvModified; + protected TextView tvModified; - public ImageView ivAlertIcon; + protected ImageView ivAlertIcon; - public TextView tvAlertDate; + protected TextView tvAlertDate; - public ImageView ibSetBgColor; + protected ImageView ibSetBgColor; } private static final Map sBgSelectorBtnsMap = new HashMap(); diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java index 2afe2a89..f8bc3d95 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java @@ -116,6 +116,8 @@ public class NoteEditText extends EditText { int off = layout.getOffsetForHorizontal(line, x); Selection.setSelection(getText(), off); break; + default: + break; } return super.onTouchEvent(event); diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index e843aecf..ecf68f05 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -63,7 +63,7 @@ import android.widget.Toast; 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.gtask.remote.GTaskSyncService; import net.micode.notes.model.WorkingNote; import net.micode.notes.tool.BackupUtils; import net.micode.notes.tool.DataUtils; @@ -161,12 +161,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { StringBuilder sb = new StringBuilder(); - InputStream in = null; - try { - in = getResources().openRawResource(R.raw.introduction); - if (in != null) { - InputStreamReader isr = new InputStreamReader(in); - BufferedReader br = new BufferedReader(isr); + //InputStream in = null; + InputStreamReader isr = null; + BufferedReader br= null; + try (InputStream in = getResources().openRawResource(R.raw.introduction)) + {if (in != null) { + isr = new InputStreamReader(in); + br = new BufferedReader(isr); char [] buf = new char[1024]; int len = 0; while ((len = br.read(buf)) > 0) { @@ -180,9 +181,25 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt e.printStackTrace(); return; } finally { - if(in != null) { +// if(in != null) { +// try { +// in.close(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } +// } + if(isr != null) { try { - in.close(); + isr.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + if(br != null) { + try { + br.close(); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -766,8 +783,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt if (mState == ListEditState.NOTE_LIST) { getMenuInflater().inflate(R.menu.note_list, menu); // set sync or sync_cancel - menu.findItem(R.id.menu_sync).setTitle( - GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync); +// menu.findItem(R.id.menu_sync).setTitle( +// GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync); } else if (mState == ListEditState.SUB_FOLDER) { getMenuInflater().inflate(R.menu.sub_folder, menu); } else if (mState == ListEditState.CALL_RECORD_FOLDER) { @@ -789,18 +806,18 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt exportNoteToText(); break; } - case R.id.menu_sync: { - if (isSyncMode()) { - if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { - GTaskSyncService.startSync(this); - } else { - GTaskSyncService.cancelSync(this); - } - } else { - startPreferenceActivity(); - } - break; - } +// case R.id.menu_sync: { +// if (isSyncMode()) { +//// if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { +//// GTaskSyncService.startSync(this); +//// } else { +//// GTaskSyncService.cancelSync(this); +//// } +// } else { +// startPreferenceActivity(); +// } +// break; +// } case R.id.menu_setting: { startPreferenceActivity(); break; diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java index 07c5f7ec..213e0397 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java @@ -45,7 +45,7 @@ import android.widget.Toast; 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.gtask.remote.GTaskSyncService; public class NotesPreferenceActivity extends PreferenceActivity { @@ -80,12 +80,12 @@ public class NotesPreferenceActivity extends PreferenceActivity { mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY); mReceiver = new GTaskReceiver(); IntentFilter filter = new IntentFilter(); - filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME); + //filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME); registerReceiver(mReceiver, filter); mOriAccounts = null; - View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); - getListView().addHeaderView(header, null, true); +// View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); +// getListView().addHeaderView(header, null, true); } @Override @@ -133,20 +133,20 @@ public class NotesPreferenceActivity extends PreferenceActivity { accountPref.setSummary(getString(R.string.preferences_account_summary)); accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() { public boolean onPreferenceClick(Preference preference) { - if (!GTaskSyncService.isSyncing()) { - if (TextUtils.isEmpty(defaultAccount)) { - // the first time to set account - showSelectAccountAlertDialog(); - } else { - // if the account has already been set, we need to promp - // user about the risk - showChangeAccountConfirmAlertDialog(); - } - } else { - Toast.makeText(NotesPreferenceActivity.this, - R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT) - .show(); - } +// if (!GTaskSyncService.isSyncing()) { +// if (TextUtils.isEmpty(defaultAccount)) { +// // the first time to set account +// showSelectAccountAlertDialog(); +// } else { +// // if the account has already been set, we need to promp +// // user about the risk +// showChangeAccountConfirmAlertDialog(); +// } +// } else { +// Toast.makeText(NotesPreferenceActivity.this, +// R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT) +// .show(); +// } return true; } }); @@ -155,42 +155,42 @@ public class NotesPreferenceActivity extends PreferenceActivity { } private void loadSyncButton() { - Button syncButton = (Button) findViewById(R.id.preference_sync_button); - TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview); +// Button syncButton = (Button) findViewById(R.id.preference_sync_button); +// TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview); // set button state - if (GTaskSyncService.isSyncing()) { - syncButton.setText(getString(R.string.preferences_button_sync_cancel)); - syncButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - GTaskSyncService.cancelSync(NotesPreferenceActivity.this); - } - }); - } else { - syncButton.setText(getString(R.string.preferences_button_sync_immediately)); - syncButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - GTaskSyncService.startSync(NotesPreferenceActivity.this); - } - }); - } - syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this))); +// if (GTaskSyncService.isSyncing()) { +// syncButton.setText(getString(R.string.preferences_button_sync_cancel)); +// syncButton.setOnClickListener(new View.OnClickListener() { +// public void onClick(View v) { +// GTaskSyncService.cancelSync(NotesPreferenceActivity.this); +// } +// }); +// } else { +// syncButton.setText(getString(R.string.preferences_button_sync_immediately)); +// syncButton.setOnClickListener(new View.OnClickListener() { +// public void onClick(View v) { +// GTaskSyncService.startSync(NotesPreferenceActivity.this); +// } +// }); +// } +// syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this))); // set last sync time - if (GTaskSyncService.isSyncing()) { - lastSyncTimeView.setText(GTaskSyncService.getProgressString()); - lastSyncTimeView.setVisibility(View.VISIBLE); - } else { - long lastSyncTime = getLastSyncTime(this); - if (lastSyncTime != 0) { - lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time, - DateFormat.format(getString(R.string.preferences_last_sync_time_format), - lastSyncTime))); - lastSyncTimeView.setVisibility(View.VISIBLE); - } else { - lastSyncTimeView.setVisibility(View.GONE); - } - } +// if (GTaskSyncService.isSyncing()) { +// lastSyncTimeView.setText(GTaskSyncService.getProgressString()); +// lastSyncTimeView.setVisibility(View.VISIBLE); +// } else { +// long lastSyncTime = getLastSyncTime(this); +// if (lastSyncTime != 0) { +// lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time, +// DateFormat.format(getString(R.string.preferences_last_sync_time_format), +// lastSyncTime))); +// lastSyncTimeView.setVisibility(View.VISIBLE); +// } else { +// lastSyncTimeView.setVisibility(View.GONE); +// } +// } } private void refreshUI() { @@ -201,14 +201,14 @@ public class NotesPreferenceActivity extends PreferenceActivity { private void showSelectAccountAlertDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); - View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); - TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); - titleTextView.setText(getString(R.string.preferences_dialog_select_account_title)); - TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); - subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips)); +// View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); +// TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); +// titleTextView.setText(getString(R.string.preferences_dialog_select_account_title)); +// TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); +// subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips)); - dialogBuilder.setCustomTitle(titleView); - dialogBuilder.setPositiveButton(null, null); +// dialogBuilder.setCustomTitle(titleView); +// dialogBuilder.setPositiveButton(null, null); Account[] accounts = getGoogleAccounts(); String defAccount = getSyncAccountName(this); @@ -237,33 +237,33 @@ public class NotesPreferenceActivity extends PreferenceActivity { }); } - View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null); - dialogBuilder.setView(addAccountView); + //View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null); + //dialogBuilder.setView(addAccountView); final AlertDialog dialog = dialogBuilder.show(); - addAccountView.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - mHasAddedAccount = true; - Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); - intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] { - "gmail-ls" - }); - startActivityForResult(intent, -1); - dialog.dismiss(); - } - }); +// addAccountView.setOnClickListener(new View.OnClickListener() { +// public void onClick(View v) { +// mHasAddedAccount = true; +// Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); +// intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] { +// "gmail-ls" +// }); +// startActivityForResult(intent, -1); +// dialog.dismiss(); +// } +// }); } private void showChangeAccountConfirmAlertDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); - View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); - TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); - titleTextView.setText(getString(R.string.preferences_dialog_change_account_title, - getSyncAccountName(this))); - TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); - subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg)); - dialogBuilder.setCustomTitle(titleView); +// View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); +// TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); +// titleTextView.setText(getString(R.string.preferences_dialog_change_account_title, +// getSyncAccountName(this))); +// TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); +// subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg)); +// dialogBuilder.setCustomTitle(titleView); CharSequence[] menuItemArray = new CharSequence[] { getString(R.string.preferences_menu_change_account), @@ -365,11 +365,11 @@ public class NotesPreferenceActivity extends PreferenceActivity { @Override public void onReceive(Context context, Intent intent) { refreshUI(); - if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) { - TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview); - syncStatus.setText(intent - .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG)); - } +// if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) { +// TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview); +// syncStatus.setText(intent +// .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG)); +// } } } diff --git a/src/Notes-master/app/src/main/res/layout/account_dialog_title.xml b/src/Notes-master/app/src/main/res/layout/account_dialog_title.xml deleted file mode 100644 index 77171121..00000000 --- a/src/Notes-master/app/src/main/res/layout/account_dialog_title.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master/app/src/main/res/layout/add_account_text.xml b/src/Notes-master/app/src/main/res/layout/add_account_text.xml deleted file mode 100644 index c7991780..00000000 --- a/src/Notes-master/app/src/main/res/layout/add_account_text.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master/app/src/main/res/layout/settings_header.xml b/src/Notes-master/app/src/main/res/layout/settings_header.xml deleted file mode 100644 index 5eb8c509..00000000 --- a/src/Notes-master/app/src/main/res/layout/settings_header.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - -