Merge branch 'master' of https://bdgit.educoder.net/pulvkty7w/zml_branch

Browse Source

develop

ZML 3 years ago

parent 2f369f6bc0 a6ed87d368

commit 947d936c33

534 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

0

Notes-master/.gradle/5.4.1/executionHistory/executionHistory.bin → src/Notes-master/.gradle/5.4.1/executionHistory/executionHistory.bin

Unescape Escape View File

0

Notes-master/.gradle/5.4.1/executionHistory/executionHistory.lock → src/Notes-master/.gradle/5.4.1/executionHistory/executionHistory.lock

Unescape Escape View File

0

Notes-master/.gradle/5.4.1/fileChanges/last-build.bin → src/Notes-master/.gradle/5.4.1/fileChanges/last-build.bin

Unescape Escape View File

0

Notes-master/.gradle/5.4.1/fileContent/fileContent.lock → src/Notes-master/.gradle/5.4.1/fileContent/fileContent.lock

Unescape Escape View File

0

Notes-master/.gradle/5.4.1/fileHashes/fileHashes.bin → src/Notes-master/.gradle/5.4.1/fileHashes/fileHashes.bin

Unescape Escape View File

0

Notes-master/.gradle/5.4.1/fileHashes/fileHashes.lock → src/Notes-master/.gradle/5.4.1/fileHashes/fileHashes.lock

Unescape Escape View File

0

Notes-master/.gradle/5.4.1/fileHashes/resourceHashesCache.bin → src/Notes-master/.gradle/5.4.1/fileHashes/resourceHashesCache.bin

Unescape Escape View File

0

Notes-master/.gradle/5.4.1/gc.properties → src/Notes-master/.gradle/5.4.1/gc.properties

Unescape Escape View File

0

Notes-master/.gradle/5.4.1/javaCompile/javaCompile.lock → src/Notes-master/.gradle/5.4.1/javaCompile/javaCompile.lock

Unescape Escape View File

0

Notes-master/.gradle/5.4.1/javaCompile/taskHistory.bin → src/Notes-master/.gradle/5.4.1/javaCompile/taskHistory.bin

Unescape Escape View File

0

Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock → src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock

Unescape Escape View File

0

Notes-master/.gradle/buildOutputCleanup/cache.properties → src/Notes-master/.gradle/buildOutputCleanup/cache.properties

Unescape Escape View File

0

Notes-master/.gradle/buildOutputCleanup/outputFiles.bin → src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin

Unescape Escape View File

0

Notes-master/.gradle/vcs-1/gc.properties → src/Notes-master/.gradle/vcs-1/gc.properties

Unescape Escape View File

0

Notes-master/.idea/.gitignore → src/Notes-master/.idea/.gitignore vendored

Unescape Escape View File

0

Notes-master/.idea/compiler.xml → src/Notes-master/.idea/compiler.xml

Unescape Escape View File

0

Notes-master/.idea/gradle.xml → src/Notes-master/.idea/gradle.xml

Unescape Escape View File

0

Notes-master/.idea/jarRepositories.xml → src/Notes-master/.idea/jarRepositories.xml

Unescape Escape View File

0

Notes-master/.idea/libraries/Gradle__org_apache_http_legacy.xml → src/Notes-master/.idea/libraries/Gradle__org_apache_http_legacy.xml

Unescape Escape View File

0

Notes-master/.idea/misc.xml → src/Notes-master/.idea/misc.xml

Unescape Escape View File

0

Notes-master/.idea/modules.xml → src/Notes-master/.idea/modules.xml

Unescape Escape View File

0

Notes-master/.idea/modules/app/Notes-master.app.iml → src/Notes-master/.idea/modules/app/Notes-master.app.iml

Unescape Escape View File

0

Notes-master/Notes-master.iml → src/Notes-master/Notes-master.iml

Unescape Escape View File

0

Notes-master/app/build.gradle → src/Notes-master/app/build.gradle

Unescape Escape View File

0

Notes-master/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java → src/Notes-master/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java

Unescape Escape View File

0

Notes-master/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java → src/Notes-master/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java

Unescape Escape View File

0

Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json → src/Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

Unescape Escape View File

0

Notes-master/app/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson → src/Notes-master/app/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson

Unescape Escape View File

0

Notes-master/app/build/intermediates/blame/res/debug/multi-v2/debug.json → src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/debug.json

Unescape Escape View File

0

Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json → src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json

Unescape Escape View File

0

Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json → src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json

Unescape Escape View File

0

Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values.json → src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values.json

Unescape Escape View File

0

Notes-master/app/build/intermediates/blame/res/debug/single/debug.json → src/Notes-master/app/build/intermediates/blame/res/debug/single/debug.json

Unescape Escape View File

0

Notes-master/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml → src/Notes-master/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml

Unescape Escape View File

0

Notes-master/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json → src/Notes-master/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json

Unescape Escape View File

0

Notes-master/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json → src/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json

Unescape Escape View File

0

Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex → src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state → src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state → src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml → src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml → src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties → src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml → src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml → src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml → src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml → src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml → src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt → src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

Unescape Escape View File

0

Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/vRoRmSEZD5YVxjYtMBZhIomkAkU= → src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/vRoRmSEZD5YVxjYtMBZhIomkAkU=

Unescape Escape View File

0

Notes-master/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml → src/Notes-master/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml

Unescape Escape View File

0

Notes-master/app/build/intermediates/instant_app_manifest/debug/output.json → src/Notes-master/app/build/intermediates/instant_app_manifest/debug/output.json

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$array.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$array.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$color.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$color.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$dimen.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$dimen.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$drawable.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$drawable.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$id.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$id.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$layout.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$layout.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$menu.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$menu.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$plurals.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$plurals.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$raw.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$raw.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/R.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class

Unescape Escape View File

0

Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class → src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class

Unescape Escape View File

Some files were not shown because too many files have changed in this diff Show More

Write Preview

Loading…

Cancel

Save