diff --git a/Notes-master/.DS_Store b/Notes-master/.DS_Store index 3e0ffc2..6f7f75a 100644 Binary files a/Notes-master/.DS_Store and b/Notes-master/.DS_Store differ diff --git a/Notes-master/.gradle/.DS_Store b/Notes-master/.gradle/.DS_Store new file mode 100644 index 0000000..74ae344 Binary files /dev/null and b/Notes-master/.gradle/.DS_Store differ diff --git a/Notes-master/.gradle/8.0/checksums/checksums.lock b/Notes-master/.gradle/8.0/checksums/checksums.lock index aa07ae3..c07a004 100644 Binary files a/Notes-master/.gradle/8.0/checksums/checksums.lock and b/Notes-master/.gradle/8.0/checksums/checksums.lock differ diff --git a/Notes-master/.gradle/8.0/checksums/md5-checksums.bin b/Notes-master/.gradle/8.0/checksums/md5-checksums.bin index 5f4fbdd..58c7c23 100644 Binary files a/Notes-master/.gradle/8.0/checksums/md5-checksums.bin and b/Notes-master/.gradle/8.0/checksums/md5-checksums.bin differ diff --git a/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin b/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin index b31ff82..258708f 100644 Binary files a/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin and b/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin differ diff --git a/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin b/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin index 844d5f8..98346b9 100644 Binary files a/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin and b/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock b/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock index 8f4a63a..1ca987e 100644 Binary files a/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock and b/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin b/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin index 0c9509d..7a317b6 100644 Binary files a/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin and b/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock b/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock index e458803..b16b65d 100644 Binary files a/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock and b/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin b/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin index dc9e7b8..f054ea8 100644 Binary files a/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a7c3d18..3216a3e 100644 Binary files a/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin index aeeeb72..2f1a61a 100644 Binary files a/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and b/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/Notes-master/.gradle/file-system.probe b/Notes-master/.gradle/file-system.probe index d4b0c01..535f01a 100644 Binary files a/Notes-master/.gradle/file-system.probe and b/Notes-master/.gradle/file-system.probe differ diff --git a/Notes-master/app/.DS_Store b/Notes-master/app/.DS_Store index 865c8a7..cc90482 100644 Binary files a/Notes-master/app/.DS_Store and b/Notes-master/app/.DS_Store differ diff --git a/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/Notes-master/app/build/intermediates/apk/debug/app-debug.apk index 578c58b..8ba4917 100644 Binary files a/Notes-master/app/build/intermediates/apk/debug/app-debug.apk and b/Notes-master/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 5f0f9f9..82eded2 100644 Binary files a/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index c4008ab..1868847 100644 --- a/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Thu May 04 19:15:42 CST 2023 +#Sun May 14 14:29:57 CST 2023 base.0=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/MainActivity.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/MainActivity.class deleted file mode 100644 index d360db7..0000000 Binary files a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/MainActivity.class and /dev/null differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class index c40e945..69ce7c4 100644 Binary files a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class index d2041cc..a0c88d0 100644 Binary files a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index df71afc..705d4cc 100644 Binary files a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index b72901f..1816017 100644 Binary files a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/MainActivity.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/MainActivity.dex deleted file mode 100644 index c7f47e6..0000000 Binary files a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/MainActivity.dex and /dev/null differ diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index 234fe74..fc3f4b3 100644 Binary files a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index 00800a0..edeb2a0 100644 Binary files a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 2c8f09c..a28e9b4 100644 Binary files a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 0619671..9b30453 100644 Binary files a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId21 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId23 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId21 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId23 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId19 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId20 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId19 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId20 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId6 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId7 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId6 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId7 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId24 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId24 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId9 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId10 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId9 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId10 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId22 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId24 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId22 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId24 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId11 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId12 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId11 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId12 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId23 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId25 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId23 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId25 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId8 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId9 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId8 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId9 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId17 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId18 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId17 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId18 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId14 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId15 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId14 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId15 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId20 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId21 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId20 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId21 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId12 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId13 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId12 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId13 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId13 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId14 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId13 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId14 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId18 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId19 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId18 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId19 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId7 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId8 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId7 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId8 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId10 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId11 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId10 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId11 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId15 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId16 similarity index 100% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId15 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId16 diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId16 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId17 similarity index 69% rename from Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId16 rename to Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId17 index b72901f..1816017 100644 Binary files a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId16 and b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId17 differ diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId22 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId22 new file mode 100644 index 0000000..15f1f77 Binary files /dev/null and b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId22 differ diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId6 b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId6 new file mode 100644 index 0000000..df71afc Binary files /dev/null and b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId6 differ diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 09fe841..a12d84c 100644 Binary files a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/Notes-master/app/src/.DS_Store b/Notes-master/app/src/.DS_Store index 3ba1179..b3ca32a 100644 Binary files a/Notes-master/app/src/.DS_Store and b/Notes-master/app/src/.DS_Store differ diff --git a/Notes-master/app/src/main/.DS_Store b/Notes-master/app/src/main/.DS_Store index 38ab27f..4ca9663 100644 Binary files a/Notes-master/app/src/main/.DS_Store and b/Notes-master/app/src/main/.DS_Store differ diff --git a/Notes-master/app/src/main/java/.DS_Store b/Notes-master/app/src/main/java/.DS_Store new file mode 100644 index 0000000..bdf6618 Binary files /dev/null and b/Notes-master/app/src/main/java/.DS_Store differ diff --git a/Notes-master/app/src/main/java/net/.DS_Store b/Notes-master/app/src/main/java/net/.DS_Store new file mode 100644 index 0000000..baf0b5c Binary files /dev/null and b/Notes-master/app/src/main/java/net/.DS_Store differ diff --git a/Notes-master/app/src/main/java/net/micode/.DS_Store b/Notes-master/app/src/main/java/net/micode/.DS_Store new file mode 100644 index 0000000..0bc4004 Binary files /dev/null and b/Notes-master/app/src/main/java/net/micode/.DS_Store differ diff --git a/Notes-master/app/src/main/java/net/micode/notes/MainActivity.java b/Notes-master/app/src/main/java/net/micode/notes/MainActivity.java deleted file mode 100644 index 3fe53d7..0000000 --- a/Notes-master/app/src/main/java/net/micode/notes/MainActivity.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.micode.notes; - -import android.app.Activity; - -public class MainActivity extends Activity { -} diff --git a/Notes-master/app/src/main/java/net/micode/notes/model/Note.java b/Notes-master/app/src/main/java/net/micode/notes/model/Note.java index 6706cf6..62b73cd 100644 --- a/Notes-master/app/src/main/java/net/micode/notes/model/Note.java +++ b/Notes-master/app/src/main/java/net/micode/notes/model/Note.java @@ -15,15 +15,15 @@ */ package net.micode.notes.model; -import android.content.ContentProviderOperation; -import android.content.ContentProviderResult; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.content.OperationApplicationException; -import android.net.Uri; -import android.os.RemoteException; -import android.util.Log; +import android.content.ContentProviderOperation;//批量的更新、插入、删除数据。 +import android.content.ContentProviderResult;//操作的结果 +import android.content.ContentUris;//用于添加和获取Uri后面的ID +import android.content.ContentValues;//一种用来存储基本数据类型数据的存储机制 +import android.content.Context;//需要用该类来弄清楚调用者的实例 +import android.content.OperationApplicationException;//操作应用程序容错 +import android.net.Uri;//表示待操作的数据 +import android.os.RemoteException;//远程容错 +import android.util.Log;//输出日志，比如说出错、警告等 import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.CallNote; @@ -49,16 +49,17 @@ public class Note { values.put(NoteColumns.MODIFIED_DATE, createdTime); values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); values.put(NoteColumns.LOCAL_MODIFIED, 1); - values.put(NoteColumns.PARENT_ID, folderId); + values.put(NoteColumns.PARENT_ID, folderId);//将数据写入数据库表格 Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); - + //ContentResolver()主要是实现外部应用对ContentProvider中的数据 + //进行添加、删除、修改和查询操作 long noteId = 0; try { noteId = Long.valueOf(uri.getPathSegments().get(1)); } catch (NumberFormatException e) { Log.e(TAG, "Get note id error :" + e.toString()); noteId = 0; - } + }//try-catch异常处理 if (noteId == -1) { throw new IllegalStateException("Wrong note id:" + noteId); } @@ -68,37 +69,37 @@ public class Note { public Note() { mNoteDiffValues = new ContentValues(); mNoteData = new NoteData(); - } + }//定义两个变量来存储标签的数据，一个是存储标签的属性，一个是存储标签的内容 public void setNoteValue(String key, String value) { mNoteDiffValues.put(key, value); mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } + }//设置数据库表格的标签属性数据 public void setTextData(String key, String value) { mNoteData.setTextData(key, value); - } + }//设置数据库表格的标签文字内容的数据 public void setTextDataId(long id) { mNoteData.setTextDataId(id); - } + }//设置文本数据的ID public long getTextDataId() { return mNoteData.mTextDataId; - } + }//得到数据文本的ID public void setCallDataId(long id) { mNoteData.setCallDataId(id); - } + }//设置电话号码数据的ID public void setCallData(String key, String value) { mNoteData.setCallData(key, value); - } + }//得到电话号码数据的ID public boolean isLocalModified() { return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified(); - } + }//判断是否是本地修改 public boolean syncNote(Context context, long noteId) { if (noteId <= 0) { @@ -128,19 +129,19 @@ public class Note { } return true; - } + }//判断数据是否同步 - private class NoteData { + private class NoteData {//定义一个基本的便签内容的数据类，主要包含文本数据和电话号码数据 private long mTextDataId; - private ContentValues mTextDataValues; + private ContentValues mTextDataValues;//文本数据 private long mCallDataId; - private ContentValues mCallDataValues; + private ContentValues mCallDataValues;//电话号码数据 private static final String TAG = "NoteData"; - + //下面是上述几个函数的具体实现 public NoteData() { mTextDataValues = new ContentValues(); mCallDataValues = new ContentValues(); @@ -177,17 +178,17 @@ public class Note { mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); } - + //下面函数的作用是将新的数据通过Uri的操作存储到数据库 Uri pushIntoContentResolver(Context context, long noteId) { /** * Check for safety */ if (noteId <= 0) { throw new IllegalArgumentException("Wrong note id:" + noteId); - } + }//判断数据是否合法 ArrayList operationList = new ArrayList(); - ContentProviderOperation.Builder builder = null; + ContentProviderOperation.Builder builder = null;//数据库的操作列表 if(mTextDataValues.size() > 0) { mTextDataValues.put(DataColumns.NOTE_ID, noteId); @@ -209,7 +210,7 @@ public class Note { operationList.add(builder.build()); } mTextDataValues.clear(); - } + }//把文本数据存入DataColumns if(mCallDataValues.size() > 0) { mCallDataValues.put(DataColumns.NOTE_ID, noteId); @@ -231,7 +232,7 @@ public class Note { operationList.add(builder.build()); } mCallDataValues.clear(); - } + }//把电话号码数据存入DataColumns if (operationList.size() > 0) { try { @@ -246,7 +247,7 @@ public class Note { Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); return null; } - } + }//存储过程中的异常处理 return null; } } diff --git a/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java b/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java index be081e4..e625572 100644 --- a/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -31,7 +31,6 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.Notes.TextNote; import net.micode.notes.tool.ResourceParser.NoteBgResources; - public class WorkingNote { // Note for the working note private Note mNote; @@ -43,17 +42,11 @@ public class WorkingNote { private int mMode; private long mAlertDate; - private long mModifiedDate; - private int mBgColorId; - private int mWidgetId; - private int mWidgetType; - private long mFolderId; - private Context mContext; private static final String TAG = "WorkingNote"; @@ -62,6 +55,7 @@ public class WorkingNote { private NoteSettingChangedListener mNoteSettingStatusListener; + // 声明 DATA_PROJECTION字符串数组 public static final String[] DATA_PROJECTION = new String[] { DataColumns.ID, DataColumns.CONTENT, @@ -72,6 +66,7 @@ public class WorkingNote { DataColumns.DATA4, }; + // 声明 NOTE_PROJECTION字符串数组 public static final String[] NOTE_PROJECTION = new String[] { NoteColumns.PARENT_ID, NoteColumns.ALERTED_DATE, @@ -82,27 +77,18 @@ public class WorkingNote { }; private static final int DATA_ID_COLUMN = 0; - private static final int DATA_CONTENT_COLUMN = 1; - private static final int DATA_MIME_TYPE_COLUMN = 2; - private static final int DATA_MODE_COLUMN = 3; - private static final int NOTE_PARENT_ID_COLUMN = 0; - private static final int NOTE_ALERTED_DATE_COLUMN = 1; - private static final int NOTE_BG_COLOR_ID_COLUMN = 2; - private static final int NOTE_WIDGET_ID_COLUMN = 3; - private static final int NOTE_WIDGET_TYPE_COLUMN = 4; - private static final int NOTE_MODIFIED_DATE_COLUMN = 5; // New note construct - private WorkingNote(Context context, long folderId) { + public WorkingNote(Context context, long folderId) { mContext = context; mAlertDate = 0; mModifiedDate = System.currentTimeMillis(); @@ -114,6 +100,7 @@ public class WorkingNote { mWidgetType = Notes.TYPE_WIDGET_INVALIDE; } + // WorkingNote的构造函数 // Existing note construct private WorkingNote(Context context, long noteId, long folderId) { mContext = context; @@ -124,11 +111,14 @@ public class WorkingNote { loadNote(); } + // 加载Note + // 通过数据库调用query函数找到第一个条目 private void loadNote() { Cursor cursor = mContext.getContentResolver().query( ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null, null, null); + // 若存在，储存相应信息 if (cursor != null) { if (cursor.moveToFirst()) { mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN); @@ -139,6 +129,7 @@ public class WorkingNote { mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); } cursor.close(); + // 若不存在，报错 } else { Log.e(TAG, "No note with id:" + mNoteId); throw new IllegalArgumentException("Unable to find note with id " + mNoteId); @@ -146,14 +137,16 @@ public class WorkingNote { loadNoteData(); } + // 加载NoteData private void loadNoteData() { Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] { - String.valueOf(mNoteId) + String.valueOf(mNoteId) }, null); if (cursor != null) { - if (cursor.moveToFirst()) { + // 查到信息不为空 + if (cursor.moveToFirst()) { // 查看第一项是否存在 do { String type = cursor.getString(DATA_MIME_TYPE_COLUMN); if (DataConstants.NOTE.equals(type)) { @@ -165,7 +158,7 @@ public class WorkingNote { } else { Log.d(TAG, "Wrong note type with type:" + type); } - } while (cursor.moveToNext()); + } while (cursor.moveToNext());//查阅所有项,直到为空 } cursor.close(); } else { @@ -174,9 +167,12 @@ public class WorkingNote { } } + // 创建空的Note + // 传参：context，文件夹id，widget，背景颜色 public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId, - int widgetType, int defaultBgColorId) { + int widgetType, int defaultBgColorId) { WorkingNote note = new WorkingNote(context, folderId); + // 设定相关属性 note.setBgColorId(defaultBgColorId); note.setWidgetId(widgetId); note.setWidgetType(widgetType); @@ -187,9 +183,10 @@ public class WorkingNote { return new WorkingNote(context, id, 0); } + // 保存Note public synchronized boolean saveNote() { - if (isWorthSaving()) { - if (!existInDatabase()) { + if (isWorthSaving()) { //是否值得保存 + if (!existInDatabase()) { // 是否存在数据库中 if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) { Log.e(TAG, "Create new note fail with id:" + mNoteId); return false; @@ -212,11 +209,14 @@ public class WorkingNote { } } + // 是否在数据库中存在 public boolean existInDatabase() { return mNoteId > 0; } + // 是否值得保存 private boolean isWorthSaving() { + // 被删除，或（不在数据库中 内容为空），或 本地已保存过 if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent)) || (existInDatabase() && !mNote.isLocalModified())) { return false; @@ -225,10 +225,14 @@ public class WorkingNote { } } + + // 设置mNoteSettingStatusListener public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) { mNoteSettingStatusListener = l; } + // 设置AlertDate + // 若 mAlertDate与data不同，则更改mAlertDate并设定NoteValue public void setAlertDate(long date, boolean set) { if (date != mAlertDate) { mAlertDate = date; @@ -239,16 +243,20 @@ public class WorkingNote { } } + // 设定删除标记 public void markDeleted(boolean mark) { + // 设定标记 mIsDeleted = mark; if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onWidgetChanged(); + mNoteSettingStatusListener.onWidgetChanged(); + // 调用mNoteSettingStatusListener的 onWidgetChanged方法 } } + // 设定背景颜色 public void setBgColorId(int id) { - if (id != mBgColorId) { + if (id != mBgColorId) { //设定条件 id != mBgColorId mBgColorId = id; if (mNoteSettingStatusListener != null) { mNoteSettingStatusListener.onBackgroundColorChanged(); @@ -257,8 +265,10 @@ public class WorkingNote { } } + // 设定检查列表模式 + // 参数：mode public void setCheckListMode(int mode) { - if (mMode != mode) { + if (mMode != mode) { //设定条件 mMode != mode if (mNoteSettingStatusListener != null) { mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode); } @@ -267,81 +277,108 @@ public class WorkingNote { } } + + // 设定WidgetType + // 参数：type public void setWidgetType(int type) { - if (type != mWidgetType) { + if (type != mWidgetType) {//设定条件 type != mWidgetType mWidgetType = type; mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType)); + // 调用Note的setNoteValue方法更改WidgetType } } + // 设定WidgetId + // 参数：id public void setWidgetId(int id) { - if (id != mWidgetId) { + if (id != mWidgetId) {//设定条件 id != mWidgetId mWidgetId = id; mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId)); + // 调用Note的setNoteValue方法更改WidgetId } } + // 设定WorkingTex + // 参数：更改的text public void setWorkingText(String text) { - if (!TextUtils.equals(mContent, text)) { + if (!TextUtils.equals(mContent, text)) {//设定条件 mContent, text内容不同 mContent = text; mNote.setTextData(DataColumns.CONTENT, mContent); + // 调用Note的setTextData方法更改WorkingText } } + // 转变mNote的CallData及CallNote信息 + // 参数：String phoneNumber, long callDate public void convertToCallNote(String phoneNumber, long callDate) { mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate)); mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber); mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER)); } + // 判断是否有时钟题型 public boolean hasClockAlert() { return (mAlertDate > 0 ? true : false); } + // 获取Content public String getContent() { return mContent; } + // 获取AlertDate public long getAlertDate() { return mAlertDate; } + // 获取ModifiedDate public long getModifiedDate() { return mModifiedDate; } + // 获取背景颜色来源id public int getBgColorResId() { return NoteBgResources.getNoteBgResource(mBgColorId); } + // 获取背景颜色id public int getBgColorId() { return mBgColorId; } + // 获取标题背景颜色id public int getTitleBgResId() { return NoteBgResources.getNoteTitleBgResource(mBgColorId); } + // 获取CheckListMode public int getCheckListMode() { return mMode; } + // 获取便签id public long getNoteId() { return mNoteId; } + // 获取文件夹id public long getFolderId() { return mFolderId; } + // 获取WidgetId public int getWidgetId() { return mWidgetId; } + // 获取WidgetType public int getWidgetType() { return mWidgetType; } + // 创建接口 NoteSettingChangedListener,便签更新监视 + // 为NoteEditActivity提供接口 + // 提供函数有 public interface NoteSettingChangedListener { /** * Called when the background color of current note has just changed @@ -365,4 +402,4 @@ public class WorkingNote { */ void onCheckListModeChanged(int oldMode, int newMode); } -} +} \ No newline at end of file diff --git a/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 2e26f9c..8d9d2aa 100644 --- a/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -93,7 +93,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private enum ListEditState { NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER - }; + } private ListEditState mState; @@ -121,7 +121,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private static final String TAG = "NotesListActivity"; - public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; + //public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; private NoteItemData mFocusNoteDataItem; @@ -141,7 +141,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt setContentView(R.layout.note_list); initResources(); - /** + /* * Insert an introduction when user firstly use this application */ setAppInfoFromRawRes(); diff --git a/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java index 07c5f7e..139d8d4 100644 --- a/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java @@ -18,7 +18,7 @@ package net.micode.notes.ui; import android.accounts.Account; import android.accounts.AccountManager; -import android.app.ActionBar; +//import android.app.ActionBar; import android.app.AlertDialog; import android.content.BroadcastReceiver; import android.content.ContentValues; @@ -35,7 +35,7 @@ import android.preference.PreferenceCategory; import android.text.TextUtils; import android.text.format.DateFormat; import android.view.LayoutInflater; -import android.view.Menu; +//import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.Button;