diff --git a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin index d9ae524..eeb1078 100644 Binary files a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin and b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock index 9d993b1..43a495f 100644 Binary files a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock and b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin index 3329e8f..db8afdf 100644 Binary files a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock index 82004b2..159f265 100644 Binary files a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin index 0a5e044..5548208 100644 Binary files a/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 3b25b0c..7fe587e 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/file-system.probe b/src/Notes-master/.gradle/file-system.probe index 6f0b15c..3d6be47 100644 Binary files a/src/Notes-master/.gradle/file-system.probe and b/src/Notes-master/.gradle/file-system.probe differ diff --git a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk new file mode 100644 index 0000000..1b347fe Binary files /dev/null and b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master/app/build/intermediates/apk/debug/output-metadata.json b/src/Notes-master/app/build/intermediates/apk/debug/output-metadata.json new file mode 100644 index 0000000..b2231b9 --- /dev/null +++ b/src/Notes-master/app/build/intermediates/apk/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "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/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt index 66652a5..46dacc6 100644 --- a/src/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt +++ b/src/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt @@ -1,2 +1,2 @@ #- File Locator - -listingFile=../../../outputs/apk/debug/output-metadata.json +listingFile=../../apk/debug/output-metadata.json 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 a54964f..d077654 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 5a25d4a..601f245 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 3665ba3..601f245 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 1f03d70..601f245 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 d2cb7d4..601f245 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 392dc21..601f245 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 91e8c8e..601f245 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_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_0/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_0/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_1/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_1/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_2/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_2/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_3/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_3/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_4/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_4/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_4/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_5/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_5/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_5/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_6/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_6/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_6/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_7/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_bucket_7/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5be8028dc6ae4b8773c34106da994811ae17d03340342608da7cd028e47034c3_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 index 3bc9134..ceae732 100644 Binary files a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex 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 5159ff4..14a959d 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/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index f1d0896..5d9c3f4 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Sun May 07 15:38:31 CST 2023 +#Sun May 07 17:12:31 CST 2023 net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index c71fd03..0000000 --- a/src/Notes-master/app/build/intermediates/incremental/debug/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/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index a1f067e..510253f 100644 --- 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 @@ -1,4 +1,4 @@ -#Sun May 07 15:40:53 CST 2023 +#Sun May 07 17:53:30 CST 2023 base.0=D\:\\programming\\gitProject1\\src\\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 index 7977355..05459c7 100644 Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources 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 index e9f5b68..a44b3a2 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class 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 index ff95cab..0784dad 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class 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 index 5012ef9..4ae491d 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class 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 index 4064ac0..8f678b1 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class 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 index 19383ea..44877df 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class 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 index 29d4cf9..a9850cf 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class new file mode 100644 index 0000000..ced363a Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class 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 index 432dd4e..9429693 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class 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 index ad7cce4..1077cf9 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class 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 index 06036f1..d2777ec 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class 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 index d42da3c..55e7663 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class 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 index 9ec847b..30aebb9 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class 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 index 5053337..3b21f15 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class 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 index f6e1ed8..5361b59 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class 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 index fabc84f..1ea9c16 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class 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 7781913..4491297 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 @@ -20,254 +20,255 @@ 20 android:versionName="0.1" > 21 22 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-44 23 android:minSdkVersion="14" -23-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:24:15-41 24 android:targetSdkVersion="29" /> -24-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +24-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-44 25 26 -26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-81 +26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-78 27 -27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-88 +27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-85 28 -28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-67 +28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-64 29 -29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-72 +29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-69 30 -30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-74 +30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-71 31 -31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-80 +31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-77 32 -32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-71 +32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-68 33 -33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-74 +33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-71 34 -34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:34:5-81 +34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:34:22-78 35 36 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:36:5-150:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 -39 android:label="@string/app_name" > -39-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 -40 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 -41 android:name="net.micode.notes.ui.NotesListActivity" -41-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 -42 android:configChanges="keyboardHidden|orientation|screenSize" -42-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 -43 android:label="@string/app_name" -43-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 -44 android:launchMode="singleTop" -44-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 -45 android:theme="@style/NoteTheme" -45-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 -46 android:uiOptions="splitActionBarWhenNarrow" -46-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 -47 android:windowSoftInputMode="adjustPan" > -47-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 -48 -48-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 -49 -49-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 -49-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 -50 -51 -51-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 -51-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 -52 -53 -54 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 -55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 -56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 -57 android:launchMode="singleTop" -57-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 -58 android:theme="@style/NoteTheme" > -58-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 -59 -59-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 -59-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:59:28-49 -60 -60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 -60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 -61 -62 -62-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -62-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -63 -64 -64-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -64-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -65 -65-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -66 -67 -67-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 -68 -68-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 -68-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 -69 -70 -70-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -70-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -71 -72 -72-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -72-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -73 -73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -74 -75 -75-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 -76 -76-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 -76-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 -77 -78 -78-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -78-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -79 -80 -81 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 -82 android:name="android.app.searchable" -82-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 -83 android:resource="@xml/searchable" /> -83-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 -84 -85 -86 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 -87 android:name="net.micode.notes.data.NotesProvider" -87-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 -88 android:authorities="micode_notes" -88-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 -89 android:multiprocess="true" /> -89-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 -90 -91 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 -92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -92-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 -93 android:label="@string/app_widget2x2" > -93-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 -94 -94-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -95 -95-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -95-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -96 -96-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -96-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -97 +38-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-42 +39 android:label="@string/app_name" +39-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-41 +40 android:testOnly="true" > +41 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:39:9-52:20 +42 android:name="net.micode.notes.ui.NotesListActivity" +42-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-49 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-74 +44 android:label="@string/app_name" +44-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-45 +45 android:launchMode="singleTop" +45-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-43 +46 android:theme="@style/NoteTheme" +46-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-45 +47 android:uiOptions="splitActionBarWhenNarrow" +47-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:45:13-57 +48 android:windowSoftInputMode="adjustPan" > +48-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-52 +49 +49-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:48:13-51:29 +50 +50-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:17-69 +50-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:25-66 +51 +52 +52-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:50:17-77 +52-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:50:27-74 +53 +54 +55 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:54:9-82:20 +56 android:name="net.micode.notes.ui.NoteEditActivity" +56-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-48 +57 android:configChanges="keyboardHidden|orientation|screenSize" +57-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-74 +58 android:launchMode="singleTop" +58-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-43 +59 android:theme="@style/NoteTheme" > +59-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-45 +60 +60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:60:13-65:29 +60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:60:28-49 +61 +61-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-69 +61-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:25-66 +62 +63 +63-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-76 +63-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:27-73 +64 +65 +65-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:17-78 +65-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:23-75 +66 +66-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:17-78 +66-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:23-75 +67 +68 +68-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:67:13-72:29 +69 +69-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:68:17-79 +69-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:68:25-76 +70 +71 +71-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-76 +71-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:27-73 +72 +73 +73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:17-78 +73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:23-75 +74 +74-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:17-78 +74-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:23-75 +75 +76 +76-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:74:13-77:29 +77 +77-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:75:17-71 +77-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:75:25-68 +78 +79 +79-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-76 +79-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:27-73 +80 +81 +82 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:79:13-81:54 +83 android:name="android.app.searchable" +83-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:80:17-54 +84 android:resource="@xml/searchable" /> +84-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:81:17-51 +85 +86 +87 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:84:9-87:43 +88 android:name="net.micode.notes.data.NotesProvider" +88-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-63 +89 android:authorities="micode_notes" +89-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:86:13-47 +90 android:multiprocess="true" /> +90-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:87:13-40 +91 +92 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:89:9-101:20 +93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +93-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-57 +94 android:label="@string/app_widget2x2" > +94-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-50 +95 +95-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:13-96:29 +96 +96-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-84 +96-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-81 +97 97-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 97-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -98 -99 -100 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 -101 android:name="android.appwidget.provider" -101-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -102 android:resource="@xml/widget_2x_info" /> -102-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 -103 -104 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 -105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -105-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 -106 android:label="@string/app_widget4x4" > -106-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 -107 -107-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -108 -108-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -108-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -109 -109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -110 +98 +98-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:95:17-85 +98-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:95:25-82 +99 +100 +101 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:98:13-100:58 +102 android:name="android.appwidget.provider" +102-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-58 +103 android:resource="@xml/widget_2x_info" /> +103-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:100:17-55 +104 +105 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:102:9-115:20 +106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +106-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:103:13-57 +107 android:label="@string/app_widget4x4" > +107-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:104:13-50 +108 +108-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:13-96:29 +109 +109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-84 +109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-81 +110 110-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 110-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -111 -112 -113 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 -114 android:name="android.appwidget.provider" -114-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -115 android:resource="@xml/widget_4x_info" /> -115-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 -116 -117 -117-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 -117-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 -118 -118-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 -119 -119-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 -119-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 -120 -121 -122 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 -123 android:name="net.micode.notes.ui.AlarmReceiver" -123-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 -124 android:process=":remote" > -124-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 -125 -126 -127 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 -128 android:name="net.micode.notes.ui.AlarmAlertActivity" -128-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 -129 android:label="@string/app_name" -129-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 -130 android:launchMode="singleInstance" -130-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 -131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -131-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 -132 -133 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 -134 android:name="net.micode.notes.ui.NotesPreferenceActivity" -134-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 -135 android:label="@string/preferences_title" -135-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 -136 android:launchMode="singleTop" -136-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 -137 android:theme="@android:style/Theme.Holo.Light" > -137-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 -138 -139 -140 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 -141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -141-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 -142 android:exported="false" > -142-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 -143 -144 -145 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 -146 android:name="android.app.default_searchable" -146-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 -147 android:value=".ui.NoteEditActivity" /> -147-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 -148 -149 -150 +111 +111-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:95:17-85 +111-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:95:25-82 +112 +113 +114 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:98:13-100:58 +115 android:name="android.appwidget.provider" +115-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-58 +116 android:resource="@xml/widget_4x_info" /> +116-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:100:17-55 +117 +118 +118-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:117:9-121:20 +118-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:117:19-55 +119 +119-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:118:13-120:29 +120 +120-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:119:17-79 +120-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:119:25-76 +121 +122 +123 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:123:9-126:20 +124 android:name="net.micode.notes.ui.AlarmReceiver" +124-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:124:13-61 +125 android:process=":remote" > +125-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:125:13-38 +126 +127 +128 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:128:9-133:20 +129 android:name="net.micode.notes.ui.AlarmAlertActivity" +129-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-50 +130 android:label="@string/app_name" +130-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-45 +131 android:launchMode="singleInstance" +131-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:131:13-48 +132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +132-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:132:13-75 +133 +134 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:135:9-140:20 +135 android:name="net.micode.notes.ui.NotesPreferenceActivity" +135-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-71 +136 android:label="@string/preferences_title" +136-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-54 +137 android:launchMode="singleTop" +137-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:138:13-43 +138 android:theme="@android:style/Theme.Holo.Light" > +138-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:139:13-60 +139 +140 +141 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:142:9-145:19 +142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +142-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:143:13-74 +143 android:exported="false" > +143-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:144:13-37 +144 +145 +146 D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:147:9-149:52 +147 android:name="android.app.default_searchable" +147-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-58 +148 android:value=".ui.NoteEditActivity" /> +148-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:149:13-49 +149 +150 +151 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 90528c0..ad07480 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,7 +36,8 @@ + android:label="@string/app_name" + android:testOnly="true" > + android:label="@string/app_name" + android:testOnly="true" > + android:label="@string/app_name" + android:testOnly="true" > @@ -56,7 +57,7 @@ android:launchMode="singleTop" android:theme="@style/NoteTheme" > - + diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java index be081e4..a1a2455 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -38,7 +38,7 @@ public class WorkingNote { // Note Id private long mNoteId; // Note content - private String mContent; + public String mContent; // Note mode private int mMode; 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 96a9ff8..ef0c78e 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 @@ -22,19 +22,34 @@ import android.app.AlertDialog; import android.app.PendingIntent; import android.app.SearchManager; import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; import android.content.ContentUris; +import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Matrix; import android.graphics.Paint; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.net.Uri; +import android.os.Build; import android.os.Bundle; +import android.os.Environment; import android.preference.PreferenceManager; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -43,10 +58,12 @@ import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; import android.view.WindowManager; +import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -65,6 +82,7 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; +import java.io.FileNotFoundException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -149,6 +167,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, private String mUserQuery; private Pattern mPattern; + private final int PHOTO_REQUEST = 1;//请求码 + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -159,12 +179,27 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } initResources(); + + + //根据id获取添加图片按钮 + final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn); + //为点击图片按钮设置监听器 + add_img_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Log.d(TAG, "onClick: click add image button"); + //ACTION_GET_CONTENT: 允许用户选择特殊种类的数据，并返回（特殊种类的数据：照一张相片或录一段音） + Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT); + //Category属性用于指定当前动作（Action）被执行的环境. + //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent + loadImage.addCategory(Intent.CATEGORY_OPENABLE); + loadImage.setType("image/*"); + startActivityForResult(loadImage, PHOTO_REQUEST); + } + }); } - /** - * Current activity may be killed when the memory is low. Once it is killed, for another time - * user load this activity, we should restore the former state - */ + @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); @@ -263,14 +298,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - protected void onResume() { + protected void onResume() {//能获得用户焦点：可以操作 super.onResume(); - initNoteScreen(); + initNoteScreen();//初始化便签屏幕 } private void initNoteScreen() { - mNoteEditor.setTextAppearance(this, TextAppearanceResources - .getTexAppearanceResource(mFontSizeId)); + mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { switchToListMode(mWorkingNote.getContent()); } else { @@ -288,11 +322,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_YEAR)); - /** - * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker - * is not ready - */ showAlertHeader(); + //将有图片路径的位置转换为图片 + convertToImage(); } private void showAlertHeader() { @@ -312,6 +344,47 @@ public class NoteEditActivity extends Activity implements OnClickListener, }; } + //路径字符串格式 转换为 图片image格式 + private void convertToImage() { + NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit + Editable editable = noteEditText.getText();//1.获取text + String noteText = editable.toString(); //2.将note内容转换为字符串 + int length = editable.length(); //内容的长度 + //3.截取img片段 [local]+uri+[local]，提取uri + for(int i = 0; i < length; i++) { + for(int j = i; j < length; j++) { + String img_fragment = noteText.substring(i, j+1); //img_fragment：关于图片路径的片段 + if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){ + int limit = 7; //[local]为7个字符 + //[local][/local]共15个字符，剩下的为真正的path长度 + int len = img_fragment.length()-15; + //从[local]之后的len个字符就是path + String path = img_fragment.substring(limit,limit+len);//获取到了图片路径 + Bitmap bitmap = null; + Log.d(TAG, "图片的路径是："+path); + try { + bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式 + } catch (Exception e) { + e.printStackTrace(); + } + if(bitmap!=null){ //若图片存在 + Log.d(TAG, "图片不为null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 + String ss = "[local]" + path + "[/local]"; + SpannableString spannableString = new SpannableString(ss); + //5.将指定的标记对象附加到文本的开始...结束范围 + spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + Log.d(TAG, "Create spannable string success!"); + Editable edit_text = noteEditText.getEditableText(); + edit_text.delete(i,i+len+15); //6.删掉图片路径的文字 + edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片 + } + } + } + } + } + @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); @@ -358,8 +431,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, || ev.getX() > (x + view.getWidth()) || ev.getY() < y || ev.getY() > (y + view.getHeight())) { - return false; - } + return false; + } return true; } @@ -418,7 +491,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - mWorkingNote.getWidgetId() + mWorkingNote.getWidgetId() }); sendBroadcast(intent); @@ -430,7 +503,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (id == R.id.btn_set_bg_color) { mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - - View.VISIBLE); + View.VISIBLE); } else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); @@ -563,10 +636,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, d.show(); } - /** - * Share note to apps that support {@link Intent#ACTION_SEND} action - * and {@text/plain} type - */ private void sendTo(Context context, String info) { Intent intent = new Intent(Intent.ACTION_SEND); intent.putExtra(Intent.EXTRA_TEXT, info); @@ -773,12 +842,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, switchToListMode(mNoteEditor.getText().toString()); } else { if (!getWorkingText()) { - mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", - "")); + mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", "")); } mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mEditTextList.setVisibility(View.GONE); mNoteEditor.setVisibility(View.VISIBLE); + convertToImage(); //退出清单模式，应该将有图片的地方显示出来 } } @@ -870,4 +939,147 @@ public class NoteEditActivity extends Activity implements OnClickListener, private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } + + @Override + //重写onActivityResult()来处理返回的数据 + protected void onActivityResult(int requestCode, int resultCode, Intent intent) { + super.onActivityResult(requestCode, resultCode, intent); + ContentResolver resolver = getContentResolver(); + switch (requestCode) { + case PHOTO_REQUEST: + Uri originalUri = intent.getData(); //1.获得图片的真实路径 + Bitmap bitmap = null; + try { + bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片 + } catch (FileNotFoundException e) { + Log.d(TAG, "onActivityResult: get file_exception"); + e.printStackTrace(); + } + + if(bitmap != null){ + //3.根据Bitmap对象创建ImageSpan对象 + Log.d(TAG, "onActivityResult: bitmap is not null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + String path = getPath(this,originalUri); + //4.使用[local][/local]将path括起来，用于之后方便识别图片路径在note中的位置 + String img_fragment= "[local]" + path + "[/local]"; + //创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 + SpannableString spannableString = new SpannableString(img_fragment); + spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + //5.将选择的图片追加到EditText中光标所在位置 + NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view); + int index = e.getSelectionStart(); //获取光标所在位置 + Log.d(TAG, "Index是: " + index); + Editable edit_text = e.getEditableText(); + edit_text.insert(index, spannableString); //将图片插入到光标所在位置 + + mWorkingNote.mContent = e.getText().toString(); + //6.把改动提交到数据库中,两个数据库表都要改的 + ContentResolver contentResolver = getContentResolver(); + ContentValues contentValues = new ContentValues(); + final long id = mWorkingNote.getNoteId(); + contentValues.put("snippet",mWorkingNote.mContent); + contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues,"_id=?",new String[]{""+id}); + ContentValues contentValues1 = new ContentValues(); + contentValues1.put("content",mWorkingNote.mContent); + contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1,"mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note",""+id}); + + }else{ + Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show(); + } + break; + default: + break; + } + } + + + //获取文件的real path + public String getPath(final Context context, final Uri uri) { + + final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + + // DocumentProvider + if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) { + // ExternalStorageProvider +// if (isExternalStorageDocument(uri)) { +// final String docId = DocumentsContract.getDocumentId(uri); +// final String[] split = docId.split(":"); +// final String type = split[0]; +// +// if ("primary".equalsIgnoreCase(type)) { +// return Environment.getExternalStorageDirectory() + "/" + split[1]; +// } +// } +// // DownloadsProvider +// else if (isDownloadsDocument(uri)) { +// final String id = DocumentsContract.getDocumentId(uri); +// final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); +// return getDataColumn(context, contentUri, null, null); +// } + // MediaProvider +// else + if (isMediaDocument(uri)) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + + Uri contentUri = null; + if ("image".equals(type)) { + contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; + } + + final String selection = "_id=?"; + final String[] selectionArgs = new String[]{split[1]}; + + return getDataColumn(context, contentUri, selection, selectionArgs); + } + } + // Media + else if ("content".equalsIgnoreCase(uri.getScheme())) { + return getDataColumn(context, uri, null, null); + } + // File + else if ("file".equalsIgnoreCase(uri.getScheme())) { + return uri.getPath(); + } + return null; + } + + + //获取数据列_获取此 Uri 的数据列的值。这对MediaStore Uris 和其他基于文件的 ContentProvider。 + public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) { + + Cursor cursor = null; + final String column = "_data"; + final String[] projection = {column}; + + try { + cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null); + if (cursor != null && cursor.moveToFirst()) { + final int column_index = cursor.getColumnIndexOrThrow(column); + return cursor.getString(column_index); + } + } finally { + if (cursor != null) + cursor.close(); + } + return null; + } + + + //是否为外部存储文件 +// public boolean isExternalStorageDocument(Uri uri) { +// return "com.android.externalstorage.documents".equals(uri.getAuthority()); +// } +// +// //是否为下载文件 +// public boolean isDownloadsDocument(Uri uri) { +// return "com.android.providers.downloads.documents".equals(uri.getAuthority()); +// } + + //是否为媒体文件 + public boolean isMediaDocument(Uri uri) { + return "com.android.providers.media.documents".equals(uri.getAuthority()); + } } diff --git a/src/Notes-master/app/src/main/res/layout/note_edit.xml b/src/Notes-master/app/src/main/res/layout/note_edit.xml index 10b2aa7..1dd486b 100644 --- a/src/Notes-master/app/src/main/res/layout/note_edit.xml +++ b/src/Notes-master/app/src/main/res/layout/note_edit.xml @@ -397,4 +397,13 @@ android:src="@drawable/selected" /> + +