diff --git a/.gradle/4.8/fileChanges/last-build.bin b/.gradle/4.8/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/4.8/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/4.8/fileHashes/fileHashes.bin b/.gradle/4.8/fileHashes/fileHashes.bin deleted file mode 100644 index 3438299..0000000 Binary files a/.gradle/4.8/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/4.8/fileHashes/fileHashes.lock b/.gradle/4.8/fileHashes/fileHashes.lock deleted file mode 100644 index c186682..0000000 Binary files a/.gradle/4.8/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/5.1.1/executionHistory/executionHistory.bin b/.gradle/5.1.1/executionHistory/executionHistory.bin index 4d42334..0b36e2c 100644 Binary files a/.gradle/5.1.1/executionHistory/executionHistory.bin and b/.gradle/5.1.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/5.1.1/executionHistory/executionHistory.lock b/.gradle/5.1.1/executionHistory/executionHistory.lock index 1947ef8..8f67ebe 100644 Binary files a/.gradle/5.1.1/executionHistory/executionHistory.lock and b/.gradle/5.1.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/5.1.1/fileHashes/fileHashes.bin b/.gradle/5.1.1/fileHashes/fileHashes.bin index a2c799d..6d25460 100644 Binary files a/.gradle/5.1.1/fileHashes/fileHashes.bin and b/.gradle/5.1.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/5.1.1/fileHashes/fileHashes.lock b/.gradle/5.1.1/fileHashes/fileHashes.lock index 0ab73aa..57925a9 100644 Binary files a/.gradle/5.1.1/fileHashes/fileHashes.lock and b/.gradle/5.1.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/5.1.1/javaCompile/javaCompile.lock b/.gradle/5.1.1/javaCompile/javaCompile.lock index beb17b0..c4b81e5 100644 Binary files a/.gradle/5.1.1/javaCompile/javaCompile.lock and b/.gradle/5.1.1/javaCompile/javaCompile.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b23d953..9607f3f 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 56f8a0d..9f97de4 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d7dd50f..162d01a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,783 +2,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + + + @@ -1088,11 +316,11 @@ - + - - + + @@ -1105,7 +333,7 @@ - + @@ -1237,9 +465,19 @@ + + + + + + + + + + - + @@ -1249,7 +487,7 @@ - + @@ -1257,41 +495,16 @@ - + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1299,20 +512,6 @@ - - - - - - - - - - - - - - @@ -1320,10 +519,32 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle index c0f7444..c14bfd7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,10 @@ android { minSdkVersion 14 targetSdkVersion 14 } - + lintOptions { + checkReleaseBuilds false + abortOnError false + } buildTypes { release { minifyEnabled false @@ -20,7 +23,7 @@ android { targetCompatibility = '1.8' sourceCompatibility = '1.8' } - +/**/ packagingOptions { exclude 'META-INF/DEPENDENCIES' exclude 'META-INF/NOTICE' diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 1e6c7be..b73796c 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Thu Sep 12 15:02:05 CST 2019 +#Thu Sep 12 17:32:12 CST 2019 base.0=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0 path.0=classes.dex renamed.0=classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt index 1b20a0e..ea62299 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt @@ -1,5 +1,5 @@ #Internal package file, do not edit. -#Thu Sep 12 15:02:06 CST 2019 +#Thu Sep 12 17:32:12 CST 2019 0.baseType=DIRECTORY 0.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0 0.path=classes.dex diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/gtask/data/MetaData.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/gtask/data/MetaData.class index 3e812f9..3f296a6 100644 Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/gtask/data/MetaData.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/app/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/net/micode/notes/gtask/data/MetaData.class b/app/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/net/micode/notes/gtask/data/MetaData.class index 3e812f9..3f296a6 100644 Binary files a/app/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/net/micode/notes/gtask/data/MetaData.class and b/app/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/MetaData.dex b/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/MetaData.dex index e4dfc42..785aec6 100644 Binary files a/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/MetaData.dex and b/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex b/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex index f5ee62e..fec5ffb 100644 Binary files a/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex and b/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex differ diff --git a/app/build/intermediates/transforms/dexMerger/debug/__content__.json b/app/build/intermediates/transforms/dexMerger/debug/__content__.json index 5148dae..7e7b736 100644 --- a/app/build/intermediates/transforms/dexMerger/debug/__content__.json +++ b/app/build/intermediates/transforms/dexMerger/debug/__content__.json @@ -1 +1 @@ -[{"name":"main","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES","MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true}] \ No newline at end of file +[{"name":"main","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES","MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true}] \ No newline at end of file diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk index 77ea15b..3807776 100644 Binary files a/app/build/outputs/apk/debug/app-debug.apk and b/app/build/outputs/apk/debug/app-debug.apk differ