diff --git a/src/Notes-master3/.gradle/7.5/checksums/checksums.lock b/src/Notes-master3/.gradle/7.5/checksums/checksums.lock deleted file mode 100644 index f774aeb..0000000 Binary files a/src/Notes-master3/.gradle/7.5/checksums/checksums.lock and /dev/null differ diff --git a/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin deleted file mode 100644 index fc2523e..0000000 Binary files a/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin and /dev/null differ diff --git a/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin deleted file mode 100644 index 415d955..0000000 Binary files a/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin and /dev/null differ diff --git a/src/Notes-master3/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/src/Notes-master3/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index 59ab61d..0000000 Binary files a/src/Notes-master3/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/src/Notes-master3/.gradle/7.5/dependencies-accessors/gc.properties b/src/Notes-master3/.gradle/7.5/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin deleted file mode 100644 index fc7274f..0000000 Binary files a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin and /dev/null differ diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock deleted file mode 100644 index 9a73260..0000000 Binary files a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock and /dev/null differ diff --git a/src/Notes-master3/.gradle/7.5/fileChanges/last-build.bin b/src/Notes-master3/.gradle/7.5/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/src/Notes-master3/.gradle/7.5/fileChanges/last-build.bin and /dev/null differ diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin deleted file mode 100644 index fd4de21..0000000 Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin and /dev/null differ diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock deleted file mode 100644 index fc6b7b9..0000000 Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock and /dev/null differ diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 6a30a96..0000000 Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/src/Notes-master3/.gradle/7.5/gc.properties b/src/Notes-master3/.gradle/7.5/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 4ff5ade..0000000 Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/cache.properties b/src/Notes-master3/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index e719c29..0000000 --- a/src/Notes-master3/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Mon Mar 27 22:35:54 CST 2023 -gradle.version=7.5 diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 4bbf440..0000000 Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe deleted file mode 100644 index 43c30ca..0000000 Binary files a/src/Notes-master3/.gradle/file-system.probe and /dev/null differ diff --git a/src/Notes-master3/.gradle/vcs-1/gc.properties b/src/Notes-master3/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/Notes-master3/.idea/.gitignore b/src/Notes-master3/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/src/Notes-master3/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/src/Notes-master3/.idea/checkstyle-idea.xml b/src/Notes-master3/.idea/checkstyle-idea.xml deleted file mode 100644 index ac8ae2c..0000000 --- a/src/Notes-master3/.idea/checkstyle-idea.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - 10.7.0 - JavaOnly - true - - - \ No newline at end of file diff --git a/src/Notes-master3/.idea/compiler.xml b/src/Notes-master3/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/src/Notes-master3/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/.idea/deploymentTargetDropDown.xml b/src/Notes-master3/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 86b11a9..0000000 --- a/src/Notes-master3/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/.idea/gradle.xml b/src/Notes-master3/.idea/gradle.xml deleted file mode 100644 index df39334..0000000 --- a/src/Notes-master3/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/.idea/jarRepositories.xml b/src/Notes-master3/.idea/jarRepositories.xml deleted file mode 100644 index a5f05cd..0000000 --- a/src/Notes-master3/.idea/jarRepositories.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/.idea/misc.xml b/src/Notes-master3/.idea/misc.xml deleted file mode 100644 index 5da8073..0000000 --- a/src/Notes-master3/.idea/misc.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/.idea/vcs.xml b/src/Notes-master3/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/src/Notes-master3/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/build.gradle b/src/Notes-master3/app/build.gradle deleted file mode 100644 index 67ac849..0000000 --- a/src/Notes-master3/app/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 33 - buildToolsVersion "33.0.2" - - defaultConfig { - applicationId "net.micode.notes" - useLibrary 'org.apache.http.legacy' - minSdkVersion 14 - targetSdkVersion 33 - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } - } -} \ No newline at end of file diff --git a/src/Notes-master3/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java b/src/Notes-master3/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java deleted file mode 100644 index db17690..0000000 --- a/src/Notes-master3/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package net.micode.notes; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String APPLICATION_ID = "net.micode.notes"; - public static final String BUILD_TYPE = "debug"; - public static final int VERSION_CODE = 1; - public static final String VERSION_NAME = "0.1"; -} diff --git a/src/Notes-master3/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/src/Notes-master3/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json deleted file mode 100644 index 9e26dfe..0000000 --- a/src/Notes-master3/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk deleted file mode 100644 index 8c8ab22..0000000 Binary files a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/output-metadata.json b/src/Notes-master3/app/build/intermediates/apk/debug/output-metadata.json deleted file mode 100644 index b2231b9..0000000 --- a/src/Notes-master3/app/build/intermediates/apk/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "app-debug.apk" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt deleted file mode 100644 index 66652a5..0000000 --- a/src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt +++ /dev/null @@ -1,2 +0,0 @@ -#- File Locator - -listingFile=../../../outputs/apk/debug/output-metadata.json diff --git a/src/Notes-master3/app/build/intermediates/app_metadata/debug/app-metadata.properties b/src/Notes-master3/app/build/intermediates/app_metadata/debug/app-metadata.properties deleted file mode 100644 index 1d16f01..0000000 --- a/src/Notes-master3/app/build/intermediates/app_metadata/debug/app-metadata.properties +++ /dev/null @@ -1,2 +0,0 @@ -appMetadataVersion=1.1 -androidGradlePluginVersion=7.4.1 diff --git a/src/Notes-master3/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/src/Notes-master3/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json deleted file mode 100644 index 714f651..0000000 --- a/src/Notes-master3/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "COMPATIBLE_SCREEN_MANIFEST", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [] -} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar deleted file mode 100644 index a54964f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin deleted file mode 100644 index 61460b4..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin deleted file mode 100644 index 69b343d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin deleted file mode 100644 index 2a8871f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin deleted file mode 100644 index fc17926..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex deleted file mode 100644 index 0d31429..0000000 Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out deleted file mode 100644 index 8ed1618..0000000 Binary files a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out deleted file mode 100644 index bf0d87a..0000000 --- a/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ /dev/null @@ -1 +0,0 @@ -4 \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state deleted file mode 100644 index 1c983fc..0000000 Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties deleted file mode 100644 index 14015f2..0000000 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ /dev/null @@ -1,96 +0,0 @@ -#Mon Apr 10 20:38:14 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗? - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误,请检查SD卡 - SD卡被占用,不能操作 - 同步已取消 - 同步失败,发生内部错误 - 同步失败,请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在,请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - - 正常 - 文字大小 - - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项,操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复 - 请选择google帐号,便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中,不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容,点击新建便签。 - 访客模式下,便签内容不可见 - \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎? - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤,請檢查SD卡 - SD卡被佔用,不能操作 - 同步已取消 - 同步失敗,發生內部錯誤 - 同步失敗,請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在,請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - - 正常 - 文字大小 - - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項,操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復 - 請選擇google帳號,便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中,不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容,點擊新建便簽。 - 訪客模式下,便籤內容不可見 - \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index e49b0c3..0000000 --- a/src/Notes-master3/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-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml deleted file mode 100644 index 26c9e3c..0000000 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - -%s - --%s - --%s - --%s - - Messaging - Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - 短信 - 邮件 - 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小正常超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 - %1$s 条符合“%2$s”的搜索结果 - - 短信 - 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小正常超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml deleted file mode 100644 index 653cc20..0000000 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml deleted file mode 100644 index 47bb771..0000000 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index c3c2d0d..0000000 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt deleted file mode 100644 index a74dc84..0000000 --- a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Apr 11 11:53:51 CST 2023 -base.0=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex -renamed.0=classes.dex -path.0=classes.dex diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources deleted file mode 100644 index 3895627..0000000 Binary files a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 deleted file mode 100644 index 945a7c5..0000000 Binary files a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class deleted file mode 100644 index f98637b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class deleted file mode 100644 index 2ddfc1d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class deleted file mode 100644 index 534af6e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class deleted file mode 100644 index 4be9a30..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class deleted file mode 100644 index 0d9547b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class deleted file mode 100644 index 37c051d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class deleted file mode 100644 index a78b61a..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class deleted file mode 100644 index bdc56b1..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class deleted file mode 100644 index 56d65f1..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class deleted file mode 100644 index 18d806f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class deleted file mode 100644 index 631d177..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class deleted file mode 100644 index fdd7354..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class deleted file mode 100644 index dbff2e1..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class deleted file mode 100644 index f8a59d5..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class deleted file mode 100644 index 5fa57d7..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class deleted file mode 100644 index 301a0d3..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class deleted file mode 100644 index 13d9b3f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class deleted file mode 100644 index a92f34e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class deleted file mode 100644 index 88c3083..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class deleted file mode 100644 index f84b2bf..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class deleted file mode 100644 index fd895e5..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class deleted file mode 100644 index 7299c91..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class deleted file mode 100644 index 6fe21f0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class deleted file mode 100644 index f105e8c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class deleted file mode 100644 index 177b444..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class deleted file mode 100644 index 20177e8..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class deleted file mode 100644 index 30318fc..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class deleted file mode 100644 index bbbea2e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class deleted file mode 100644 index 46734e7..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class deleted file mode 100644 index e9f5b68..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class deleted file mode 100644 index bfb671c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class deleted file mode 100644 index ed4ac8e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class deleted file mode 100644 index fc1d9a2..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class deleted file mode 100644 index d4500ff..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class deleted file mode 100644 index f1053bc..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class deleted file mode 100644 index 34b5c02..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class deleted file mode 100644 index 1714fc2..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class deleted file mode 100644 index 595f36d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class deleted file mode 100644 index 7ded6f4..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class deleted file mode 100644 index 79598f6..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class deleted file mode 100644 index 124eb6a..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class deleted file mode 100644 index e8e0e45..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class deleted file mode 100644 index c3ee8d8..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class deleted file mode 100644 index 4812c99..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class deleted file mode 100644 index 0754ffc..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class deleted file mode 100644 index dc60fe0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class deleted file mode 100644 index 6597282..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class deleted file mode 100644 index ff95cab..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class deleted file mode 100644 index 75a9a17..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class deleted file mode 100644 index fa573a1..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class deleted file mode 100644 index 81d6513..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class deleted file mode 100644 index 66c9e6f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class deleted file mode 100644 index 86cabc1..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class deleted file mode 100644 index 5012ef9..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class deleted file mode 100644 index 354ae8e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class deleted file mode 100644 index 4064ac0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class deleted file mode 100644 index 19383ea..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class deleted file mode 100644 index 29d4cf9..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class deleted file mode 100644 index 432dd4e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class deleted file mode 100644 index ad7cce4..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class deleted file mode 100644 index 6e0f050..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class deleted file mode 100644 index 1a3310a..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class deleted file mode 100644 index 93cd34b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class deleted file mode 100644 index fea6568..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class deleted file mode 100644 index 1588b99..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class deleted file mode 100644 index d4e78a1..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class deleted file mode 100644 index e7ac3f6..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class deleted file mode 100644 index 11e437f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class deleted file mode 100644 index df2d946..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class deleted file mode 100644 index dbd12f5..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class deleted file mode 100644 index 4981765..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class deleted file mode 100644 index 64f15ff..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class deleted file mode 100644 index 817bf17..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class deleted file mode 100644 index 77d2608..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class deleted file mode 100644 index b979434..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class deleted file mode 100644 index e8eaf4b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class deleted file mode 100644 index b243892..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class deleted file mode 100644 index 06036f1..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class deleted file mode 100644 index 08ab9fa..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class deleted file mode 100644 index ff543cd..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class deleted file mode 100644 index d42da3c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class deleted file mode 100644 index 5d8717b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class deleted file mode 100644 index b58eac3..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class deleted file mode 100644 index 9ec847b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class deleted file mode 100644 index 7598ed0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class deleted file mode 100644 index 573ba34..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class deleted file mode 100644 index a1c7178..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class deleted file mode 100644 index c01fcae..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class deleted file mode 100644 index d7027b9..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class deleted file mode 100644 index eb4eff7..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class deleted file mode 100644 index 245633b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class deleted file mode 100644 index bcc1f6d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class deleted file mode 100644 index 5053337..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class deleted file mode 100644 index f6e1ed8..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class deleted file mode 100644 index fabc84f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class deleted file mode 100644 index e33d1c0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class deleted file mode 100644 index e315716..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt deleted file mode 100644 index 1574a40..0000000 --- a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ /dev/null @@ -1,284 +0,0 @@ -1 -2 -17 -21 -22 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -23 android:minSdkVersion="14" -23-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 -24 android:targetSdkVersion="33" /> -24-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -25 -26 -26-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 -26-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 -27 -27-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 -27-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 -28 -28-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 -28-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 -29 -29-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 -29-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 -30 -30-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 -30-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 -31 -31-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 -31-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 -32 -32-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 -32-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 -33 -33-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 -33-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 -34 -34-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 -34-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 -35 -36 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 -37 android:debuggable="true" -38 android:icon="@drawable/icon_app" -38-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 -39 android:label="@string/app_name" > -39-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 -40 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 -41 android:name="net.micode.notes.ui.NotesListActivity" -41-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 -42 android:configChanges="keyboardHidden|orientation|screenSize" -42-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 -43 android:exported="true" -43-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 -44 android:launchMode="singleTop" -44-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 -45 android:theme="@style/NoteTheme" -45-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 -46 android:uiOptions="splitActionBarWhenNarrow" -46-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 -47 android:windowSoftInputMode="adjustPan" > -47-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 -48 -48-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 -49 -49-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 -49-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 -50 -51 -51-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 -51-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 -52 -53 -54 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 -55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 -56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 -57 android:exported="true" -57-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 -58 android:launchMode="singleTop" -58-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 -59 android:theme="@style/NoteTheme" > -59-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 -60 -60-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 -60-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 -61 -61-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 -61-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 -62 -63 -63-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -63-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 -64 -65 -65-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -65-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 -66 -66-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -66-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 -67 -68 -68-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 -69 -69-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 -69-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 -70 -71 -71-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -71-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 -72 -73 -73-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -73-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 -74 -74-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -74-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 -75 -76 -76-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 -77 -77-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 -77-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 -78 -79 -79-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -79-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 -80 -81 -82 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 -83 android:name="android.app.searchable" -83-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 -84 android:resource="@xml/searchable" /> -84-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 -85 -86 -87 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 -88 android:name="net.micode.notes.data.NotesProvider" -88-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 -89 android:authorities="micode_notes" -89-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 -90 android:exported="false" -90-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 -91 android:multiprocess="true" /> -91-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 -92 -93 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 -94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -94-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 -95 android:exported="true" -95-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 -96 android:label="@string/app_widget2x2" > -96-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 -97 -97-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 -98 -98-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 -98-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 -99 -99-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 -99-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 -100 -100-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 -100-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 -101 -102 -103 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 -104 android:name="android.appwidget.provider" -104-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 -105 android:resource="@xml/widget_2x_info" /> -105-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 -106 -107 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 -108 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -108-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 -109 android:exported="true" -109-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 -110 android:label="@string/app_widget4x4" > -110-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 -111 -111-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 -112 -112-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 -112-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 -113 -113-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 -113-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 -114 -114-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 -114-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 -115 -116 -117 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 -118 android:name="android.appwidget.provider" -118-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 -119 android:resource="@xml/widget_4x_info" /> -119-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 -120 -121 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 -122 android:name="net.micode.notes.ui.AlarmInitReceiver" -122-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 -123 android:exported="true" > -123-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 -124 -124-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 -125 -125-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 -125-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 -126 -127 -128 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 -129 android:name="net.micode.notes.ui.AlarmReceiver" -129-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 -130 android:process=":remote" > -130-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 -131 -132 -133 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 -134 android:name="net.micode.notes.ui.AlarmAlertActivity" -134-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 -135 android:label="@string/app_name" -135-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 -136 android:launchMode="singleInstance" -136-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 -137 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -137-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 -138 -139 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 -140 android:name="net.micode.notes.ui.NotesPreferenceActivity" -140-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 -141 android:label="@string/preferences_title" -141-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 -142 android:launchMode="singleTop" -142-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 -143 android:theme="@android:style/Theme.Holo.Light" > -143-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 -144 -145 -146 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 -147 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -147-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 -148 android:exported="false" > -148-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 -149 -150 -151 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 -152 android:name="android.app.default_searchable" -152-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 -153 android:value=".ui.NoteEditActivity" /> -153-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 -154 -155 -156 diff --git a/src/Notes-master3/app/build/intermediates/merged_java_res/debug/base.jar b/src/Notes-master3/app/build/intermediates/merged_java_res/debug/base.jar deleted file mode 100644 index 15cb0ec..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_java_res/debug/base.jar and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml deleted file mode 100644 index 4ce9215..0000000 --- a/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml deleted file mode 100644 index 4ce9215..0000000 --- a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/output-metadata.json b/src/Notes-master3/app/build/intermediates/merged_manifests/debug/output-metadata.json deleted file mode 100644 index a56d03a..0000000 --- a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "MERGED_MANIFESTS", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "AndroidManifest.xml" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat deleted file mode 100644 index 802be34..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat deleted file mode 100644 index 2d9ddb4..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat deleted file mode 100644 index a783113..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat deleted file mode 100644 index a9576bb..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat deleted file mode 100644 index 0692876..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat deleted file mode 100644 index a5cd8ef..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat deleted file mode 100644 index b5e283d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat deleted file mode 100644 index 74c78c0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat deleted file mode 100644 index 5436926..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat deleted file mode 100644 index 4d95a89..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat deleted file mode 100644 index ce52bc1..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat deleted file mode 100644 index b376e80..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat deleted file mode 100644 index b8cc9ab..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat deleted file mode 100644 index 2af509b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat deleted file mode 100644 index f3a6c60..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat deleted file mode 100644 index 8828ae3..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat deleted file mode 100644 index 8a98c38..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat deleted file mode 100644 index 4c9bdf9..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat deleted file mode 100644 index 1422573..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat deleted file mode 100644 index 704993a..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat deleted file mode 100644 index 9a4b989..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat deleted file mode 100644 index 11857a4..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat deleted file mode 100644 index 2227ab8..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat deleted file mode 100644 index 27a8412..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat deleted file mode 100644 index 0bda0bc..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat deleted file mode 100644 index 75f3cd0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat deleted file mode 100644 index f82dd6d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat deleted file mode 100644 index d57fe3a..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat deleted file mode 100644 index 683b6f1..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat deleted file mode 100644 index e75e056..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat deleted file mode 100644 index 3f89243..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat deleted file mode 100644 index 6b24efc..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat deleted file mode 100644 index 4f7fa61..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat deleted file mode 100644 index 725a39f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat deleted file mode 100644 index f7b11e8..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat deleted file mode 100644 index 82de739..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat deleted file mode 100644 index 224f699..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat deleted file mode 100644 index 6c1bc35..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat deleted file mode 100644 index d29584e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat deleted file mode 100644 index 394cf64..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat deleted file mode 100644 index 6a55c1f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat deleted file mode 100644 index d3094aa..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat deleted file mode 100644 index a3558dd..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat deleted file mode 100644 index e9e827a..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat deleted file mode 100644 index 812fbce..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat deleted file mode 100644 index c4a34ba..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat deleted file mode 100644 index a0b2963..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat deleted file mode 100644 index 0d0a7c7..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat deleted file mode 100644 index 7b7b9c9..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat deleted file mode 100644 index ac802ba..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat deleted file mode 100644 index ee82d6c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat deleted file mode 100644 index 8d48e8e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat deleted file mode 100644 index dbeee0b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat deleted file mode 100644 index e55822d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat deleted file mode 100644 index be2aedd..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat deleted file mode 100644 index 8f6daec..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat deleted file mode 100644 index 87aeb20..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat deleted file mode 100644 index 825e93d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat deleted file mode 100644 index e039b02..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat deleted file mode 100644 index a2eb42b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat deleted file mode 100644 index c7eff78..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat deleted file mode 100644 index decfaad..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat deleted file mode 100644 index 7c3cf3a..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat deleted file mode 100644 index 1c75d02..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat deleted file mode 100644 index e82e879..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat deleted file mode 100644 index 366fd2c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat deleted file mode 100644 index ac23b11..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat deleted file mode 100644 index 8b4b3a5..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat deleted file mode 100644 index 5fdf154..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat deleted file mode 100644 index f2fd34a..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat deleted file mode 100644 index 16cf2ef..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat deleted file mode 100644 index afee10f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat deleted file mode 100644 index b3d34f5..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat deleted file mode 100644 index 951dd2f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat deleted file mode 100644 index 544cfb6..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat deleted file mode 100644 index 2ae3d38..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat deleted file mode 100644 index b092461..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat deleted file mode 100644 index ef9a690..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat deleted file mode 100644 index 48aa960..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat deleted file mode 100644 index 4b1a1cd..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat deleted file mode 100644 index c923e71..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat deleted file mode 100644 index bd9974e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat deleted file mode 100644 index c89b09d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat deleted file mode 100644 index 504fc9c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat deleted file mode 100644 index c2c61cc..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat deleted file mode 100644 index c138bc9..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat deleted file mode 100644 index 6e3c761..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat deleted file mode 100644 index 60513de..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat deleted file mode 100644 index 4e4f099..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat deleted file mode 100644 index 17cb018..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/raw_introduction.flat deleted file mode 100644 index 608c6fd..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw_introduction.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat deleted file mode 100644 index 035ddcd..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat deleted file mode 100644 index 1043ced..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat deleted file mode 100644 index ea0ebfc..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat deleted file mode 100644 index e36a338..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat deleted file mode 100644 index c4dc076..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat deleted file mode 100644 index b960844..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat deleted file mode 100644 index 1605ca0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json deleted file mode 100644 index be3949e..0000000 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", - "map": [ - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json deleted file mode 100644 index 97aabf6..0000000 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", - "map": [ - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json deleted file mode 100644 index fe6ada6..0000000 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", - "map": [ - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json deleted file mode 100644 index ba55bf8..0000000 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", - "map": [ - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json deleted file mode 100644 index 2a106a9..0000000 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ /dev/null @@ -1,382 +0,0 @@ -[ - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_item.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw/introduction" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", - "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/preferences.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/searchable.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" - } -] \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/navigation_json/debug/navigation.json b/src/Notes-master3/app/build/intermediates/navigation_json/debug/navigation.json deleted file mode 100644 index 0637a08..0000000 --- a/src/Notes-master3/app/build/intermediates/navigation_json/debug/navigation.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml deleted file mode 100644 index 4ce9215..0000000 --- a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/output-metadata.json deleted file mode 100644 index eea66e3..0000000 --- a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "PACKAGED_MANIFESTS", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "AndroidManifest.xml" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/output-metadata.json b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/output-metadata.json deleted file mode 100644 index 1eefece..0000000 --- a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "PROCESSED_RES", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "resources-debug.ap_" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ deleted file mode 100644 index 5e131fb..0000000 Binary files a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex deleted file mode 100644 index f29c886..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex deleted file mode 100644 index 141cd42..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex deleted file mode 100644 index d8ec2c4..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex deleted file mode 100644 index 983f364..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex deleted file mode 100644 index eceecda..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex deleted file mode 100644 index e32f11d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex deleted file mode 100644 index 2f5ecfb..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex deleted file mode 100644 index e9e44c0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex deleted file mode 100644 index 3fe4a9b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex deleted file mode 100644 index 85011a3..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex deleted file mode 100644 index 876f298..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex deleted file mode 100644 index 9240589..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex deleted file mode 100644 index 1c5583b..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex deleted file mode 100644 index 9b3fcbe..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex deleted file mode 100644 index 39dbd34..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex deleted file mode 100644 index 97e54ac..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex deleted file mode 100644 index d7a560a..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex deleted file mode 100644 index 95fc8be..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex deleted file mode 100644 index 05a4c06..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex deleted file mode 100644 index 876254e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex deleted file mode 100644 index 3229f07..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex deleted file mode 100644 index cacd9ba..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex deleted file mode 100644 index ed04369..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex deleted file mode 100644 index aed7564..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex deleted file mode 100644 index 738d834..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex deleted file mode 100644 index 8bce670..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex deleted file mode 100644 index 0139b42..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex deleted file mode 100644 index 452e2d0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex deleted file mode 100644 index 2115569..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex deleted file mode 100644 index 6d49e10..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex deleted file mode 100644 index 2b85968..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex deleted file mode 100644 index 7f9fa34..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex deleted file mode 100644 index 5ed9619..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex deleted file mode 100644 index 144cf9c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex deleted file mode 100644 index ffbb9b0..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex deleted file mode 100644 index b6a3528..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex deleted file mode 100644 index ae6e2a4..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex deleted file mode 100644 index 869e07c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex deleted file mode 100644 index f67c640..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex deleted file mode 100644 index c1b64ec..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex deleted file mode 100644 index 25a62a7..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex deleted file mode 100644 index 261b9bc..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex deleted file mode 100644 index 7822adc..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex deleted file mode 100644 index bb825ba..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex deleted file mode 100644 index bf17cb1..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex deleted file mode 100644 index b3346ee..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex deleted file mode 100644 index 5d89d10..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex deleted file mode 100644 index d79f719..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex deleted file mode 100644 index eaa7650..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex deleted file mode 100644 index fea922e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex deleted file mode 100644 index 5f69d8d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex deleted file mode 100644 index 8f6696d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex deleted file mode 100644 index 63acb0d..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex deleted file mode 100644 index dca62bf..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex deleted file mode 100644 index d339f97..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex deleted file mode 100644 index 4d23f7e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex deleted file mode 100644 index 213abb6..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex deleted file mode 100644 index 91b250c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex deleted file mode 100644 index 60573ff..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex deleted file mode 100644 index 14c1054..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex deleted file mode 100644 index d2b4e3e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex deleted file mode 100644 index c5e6113..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex deleted file mode 100644 index c94758c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex deleted file mode 100644 index 5e2cb53..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex deleted file mode 100644 index 824e394..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex deleted file mode 100644 index 006a623..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex deleted file mode 100644 index 67e1670..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex deleted file mode 100644 index 229c99c..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex deleted file mode 100644 index d511096..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex deleted file mode 100644 index c225369..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex deleted file mode 100644 index 8a40d27..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex deleted file mode 100644 index c0af1bf..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex deleted file mode 100644 index e75d783..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex deleted file mode 100644 index 4286590..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex deleted file mode 100644 index eb9700e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex deleted file mode 100644 index 0c3d635..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex deleted file mode 100644 index 48c303e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex deleted file mode 100644 index cdb9cf3..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex deleted file mode 100644 index fa37181..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex deleted file mode 100644 index 3f863ce..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex deleted file mode 100644 index 6608177..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex deleted file mode 100644 index 311f487..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex deleted file mode 100644 index d38040f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex deleted file mode 100644 index 0734e34..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex deleted file mode 100644 index 631e973..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex deleted file mode 100644 index e15a061..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex deleted file mode 100644 index 3c7c3d5..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex deleted file mode 100644 index 0883a78..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex deleted file mode 100644 index a4132a8..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex deleted file mode 100644 index 9dcc1b5..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex deleted file mode 100644 index 4436b28..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex deleted file mode 100644 index 371948e..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex deleted file mode 100644 index da80f06..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex deleted file mode 100644 index 766db39..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex deleted file mode 100644 index b1c5096..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex deleted file mode 100644 index 995370f..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex deleted file mode 100644 index 73f6100..0000000 Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt deleted file mode 100644 index 00d6e91..0000000 --- a/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ /dev/null @@ -1,283 +0,0 @@ -int array format_for_exported_note 0x7f010000 -int array menu_share_ways 0x7f010001 -int color primary_text_dark 0x7f020000 -int color secondary_text_dark 0x7f020001 -int color user_query_highlight 0x7f020002 -int dimen text_font_size_large 0x7f030000 -int dimen text_font_size_medium 0x7f030001 -int dimen text_font_size_normal 0x7f030002 -int dimen text_font_size_small 0x7f030003 -int dimen text_font_size_super 0x7f030004 -int drawable bg_btn_set_color 0x7f040000 -int drawable bg_color_btn_mask 0x7f040001 -int drawable call_record 0x7f040002 -int drawable clock 0x7f040003 -int drawable delete 0x7f040004 -int drawable dropdown_icon 0x7f040005 -int drawable edit_blue 0x7f040006 -int drawable edit_green 0x7f040007 -int drawable edit_red 0x7f040008 -int drawable edit_title_blue 0x7f040009 -int drawable edit_title_green 0x7f04000a -int drawable edit_title_red 0x7f04000b -int drawable edit_title_white 0x7f04000c -int drawable edit_title_yellow 0x7f04000d -int drawable edit_white 0x7f04000e -int drawable edit_yellow 0x7f04000f -int drawable font_large 0x7f040010 -int drawable font_normal 0x7f040011 -int drawable font_size_selector_bg 0x7f040012 -int drawable font_small 0x7f040013 -int drawable font_super 0x7f040014 -int drawable icon_app 0x7f040015 -int drawable list_background 0x7f040016 -int drawable list_blue_down 0x7f040017 -int drawable list_blue_middle 0x7f040018 -int drawable list_blue_single 0x7f040019 -int drawable list_blue_up 0x7f04001a -int drawable list_folder 0x7f04001b -int drawable list_footer_bg 0x7f04001c -int drawable list_green_down 0x7f04001d -int drawable list_green_middle 0x7f04001e -int drawable list_green_single 0x7f04001f -int drawable list_green_up 0x7f040020 -int drawable list_red_down 0x7f040021 -int drawable list_red_middle 0x7f040022 -int drawable list_red_single 0x7f040023 -int drawable list_red_up 0x7f040024 -int drawable list_white_down 0x7f040025 -int drawable list_white_middle 0x7f040026 -int drawable list_white_single 0x7f040027 -int drawable list_white_up 0x7f040028 -int drawable list_yellow_down 0x7f040029 -int drawable list_yellow_middle 0x7f04002a -int drawable list_yellow_single 0x7f04002b -int drawable list_yellow_up 0x7f04002c -int drawable menu_delete 0x7f04002d -int drawable menu_move 0x7f04002e -int drawable new_note 0x7f04002f -int drawable new_note_normal 0x7f040030 -int drawable new_note_pressed 0x7f040031 -int drawable note_edit_color_selector_panel 0x7f040032 -int drawable notification 0x7f040033 -int drawable search_result 0x7f040034 -int drawable selected 0x7f040035 -int drawable title_alert 0x7f040036 -int drawable title_bar_bg 0x7f040037 -int drawable widget_2x_blue 0x7f040038 -int drawable widget_2x_green 0x7f040039 -int drawable widget_2x_red 0x7f04003a -int drawable widget_2x_white 0x7f04003b -int drawable widget_2x_yellow 0x7f04003c -int drawable widget_4x_blue 0x7f04003d -int drawable widget_4x_green 0x7f04003e -int drawable widget_4x_red 0x7f04003f -int drawable widget_4x_white 0x7f040040 -int drawable widget_4x_yellow 0x7f040041 -int id account_dialog_subtitle 0x7f050000 -int id account_dialog_title 0x7f050001 -int id action_select_all 0x7f050002 -int id amPm 0x7f050003 -int id btn_new_note 0x7f050004 -int id btn_set_bg_color 0x7f050005 -int id cb_edit_item 0x7f050006 -int id date 0x7f050007 -int id delete 0x7f050008 -int id et_edit_text 0x7f050009 -int id et_foler_name 0x7f05000a -int id font_size_selector 0x7f05000b -int id hour 0x7f05000c -int id iv_alert_icon 0x7f05000d -int id iv_bg_blue 0x7f05000e -int id iv_bg_blue_select 0x7f05000f -int id iv_bg_green 0x7f050010 -int id iv_bg_green_select 0x7f050011 -int id iv_bg_red 0x7f050012 -int id iv_bg_red_select 0x7f050013 -int id iv_bg_white 0x7f050014 -int id iv_bg_white_select 0x7f050015 -int id iv_bg_yellow 0x7f050016 -int id iv_bg_yellow_select 0x7f050017 -int id iv_large_select 0x7f050018 -int id iv_medium_select 0x7f050019 -int id iv_small_select 0x7f05001a -int id iv_super_select 0x7f05001b -int id ll_font_large 0x7f05001c -int id ll_font_normal 0x7f05001d -int id ll_font_small 0x7f05001e -int id ll_font_super 0x7f05001f -int id menu_alert 0x7f050020 -int id menu_delete 0x7f050021 -int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050023 -int id menu_font_size 0x7f050024 -int id menu_list_mode 0x7f050025 -int id menu_new_folder 0x7f050026 -int id menu_new_note 0x7f050027 -int id menu_search 0x7f050028 -int id menu_send_to_desktop 0x7f050029 -int id menu_setting 0x7f05002a -int id menu_share 0x7f05002b -int id menu_sync 0x7f05002c -int id minute 0x7f05002d -int id move 0x7f05002e -int id navigation_bar 0x7f05002f -int id note_bg_color_selector 0x7f050030 -int id note_edit_list 0x7f050031 -int id note_edit_view 0x7f050032 -int id note_item 0x7f050033 -int id note_title 0x7f050034 -int id notes_list 0x7f050035 -int id prefenerece_sync_status_textview 0x7f050036 -int id preference_sync_button 0x7f050037 -int id selection_menu 0x7f050038 -int id sv_note_edit 0x7f050039 -int id tv_alert_date 0x7f05003a -int id tv_folder_name 0x7f05003b -int id tv_modified_date 0x7f05003c -int id tv_name 0x7f05003d -int id tv_time 0x7f05003e -int id tv_title 0x7f05003f -int id tv_title_bar 0x7f050040 -int id widget_bg_image 0x7f050041 -int id widget_text 0x7f050042 -int layout account_dialog_title 0x7f060000 -int layout add_account_text 0x7f060001 -int layout datetime_picker 0x7f060002 -int layout dialog_edit_text 0x7f060003 -int layout folder_list_item 0x7f060004 -int layout note_edit 0x7f060005 -int layout note_edit_list_item 0x7f060006 -int layout note_item 0x7f060007 -int layout note_list 0x7f060008 -int layout note_list_dropdown_menu 0x7f060009 -int layout note_list_footer 0x7f06000a -int layout settings_header 0x7f06000b -int layout widget_2x 0x7f06000c -int layout widget_4x 0x7f06000d -int menu call_note_edit 0x7f070000 -int menu call_record_folder 0x7f070001 -int menu note_edit 0x7f070002 -int menu note_list 0x7f070003 -int menu note_list_dropdown 0x7f070004 -int menu note_list_options 0x7f070005 -int menu sub_folder 0x7f070006 -int plurals search_results_title 0x7f080000 -int raw introduction 0x7f090000 -int string alert_message_delete_folder 0x7f0a0000 -int string alert_message_delete_note 0x7f0a0001 -int string alert_message_delete_notes 0x7f0a0002 -int string alert_title_delete 0x7f0a0003 -int string app_name 0x7f0a0004 -int string app_widget2x2 0x7f0a0005 -int string app_widget4x4 0x7f0a0006 -int string button_delete 0x7f0a0007 -int string call_record_folder_name 0x7f0a0008 -int string datetime_dialog_cancel 0x7f0a0009 -int string datetime_dialog_ok 0x7f0a000a -int string delete_remind_time_message 0x7f0a000b -int string error_note_empty_for_clock 0x7f0a000c -int string error_note_empty_for_send_to_desktop 0x7f0a000d -int string error_note_not_exist 0x7f0a000e -int string error_sdcard_export 0x7f0a000f -int string error_sdcard_unmounted 0x7f0a0010 -int string error_sync_cancelled 0x7f0a0011 -int string error_sync_internal 0x7f0a0012 -int string error_sync_network 0x7f0a0013 -int string failed_sdcard_export 0x7f0a0014 -int string file_name_txt_format 0x7f0a0015 -int string file_path 0x7f0a0016 -int string folder_exist 0x7f0a0017 -int string format_date_ymd 0x7f0a0018 -int string format_datetime_mdhm 0x7f0a0019 -int string format_exported_file_location 0x7f0a001a -int string format_folder_files_count 0x7f0a001b -int string format_move_notes_to_folder 0x7f0a001c -int string hint_foler_name 0x7f0a001d -int string info_note_enter_desktop 0x7f0a001e -int string menu_alert 0x7f0a001f -int string menu_create_folder 0x7f0a0020 -int string menu_delete 0x7f0a0021 -int string menu_deselect_all 0x7f0a0022 -int string menu_export_text 0x7f0a0023 -int string menu_folder_change_name 0x7f0a0024 -int string menu_folder_delete 0x7f0a0025 -int string menu_folder_view 0x7f0a0026 -int string menu_font_large 0x7f0a0027 -int string menu_font_normal 0x7f0a0028 -int string menu_font_size 0x7f0a0029 -int string menu_font_small 0x7f0a002a -int string menu_font_super 0x7f0a002b -int string menu_list_mode 0x7f0a002c -int string menu_move 0x7f0a002d -int string menu_move_parent_folder 0x7f0a002e -int string menu_normal_mode 0x7f0a002f -int string menu_remove_remind 0x7f0a0030 -int string menu_search 0x7f0a0031 -int string menu_select_all 0x7f0a0032 -int string menu_select_none 0x7f0a0033 -int string menu_select_title 0x7f0a0034 -int string menu_send_to_desktop 0x7f0a0035 -int string menu_setting 0x7f0a0036 -int string menu_share 0x7f0a0037 -int string menu_sync 0x7f0a0038 -int string menu_sync_cancel 0x7f0a0039 -int string menu_title_select_folder 0x7f0a003a -int string note_alert_expired 0x7f0a003b -int string note_link_email 0x7f0a003c -int string note_link_other 0x7f0a003d -int string note_link_tel 0x7f0a003e -int string note_link_web 0x7f0a003f -int string notealert_enter 0x7f0a0040 -int string notealert_ok 0x7f0a0041 -int string notelist_menu_new 0x7f0a0042 -int string notelist_string_info 0x7f0a0043 -int string preferences_account_summary 0x7f0a0044 -int string preferences_account_title 0x7f0a0045 -int string preferences_add_account 0x7f0a0046 -int string preferences_bg_random_appear_title 0x7f0a0047 -int string preferences_button_sync_cancel 0x7f0a0048 -int string preferences_button_sync_immediately 0x7f0a0049 -int string preferences_dialog_change_account_title 0x7f0a004a -int string preferences_dialog_change_account_warn_msg 0x7f0a004b -int string preferences_dialog_select_account_tips 0x7f0a004c -int string preferences_dialog_select_account_title 0x7f0a004d -int string preferences_last_sync_time 0x7f0a004e -int string preferences_last_sync_time_format 0x7f0a004f -int string preferences_menu_cancel 0x7f0a0050 -int string preferences_menu_change_account 0x7f0a0051 -int string preferences_menu_remove_account 0x7f0a0052 -int string preferences_title 0x7f0a0053 -int string preferences_toast_cannot_change_account 0x7f0a0054 -int string preferences_toast_success_set_accout 0x7f0a0055 -int string search 0x7f0a0056 -int string search_hint 0x7f0a0057 -int string search_label 0x7f0a0058 -int string search_setting_description 0x7f0a0059 -int string set_remind_time_message 0x7f0a005a -int string success_sdcard_export 0x7f0a005b -int string success_sync_account 0x7f0a005c -int string sync_progress_init_list 0x7f0a005d -int string sync_progress_login 0x7f0a005e -int string sync_progress_syncing 0x7f0a005f -int string ticker_cancel 0x7f0a0060 -int string ticker_fail 0x7f0a0061 -int string ticker_success 0x7f0a0062 -int string ticker_syncing 0x7f0a0063 -int string widget_havenot_content 0x7f0a0064 -int string widget_under_visit_mode 0x7f0a0065 -int style HighlightTextAppearancePrimary 0x7f0b0000 -int style HighlightTextAppearanceSecondary 0x7f0b0001 -int style NoteActionBarStyle 0x7f0b0002 -int style NoteTheme 0x7f0b0003 -int style TextAppearanceLarge 0x7f0b0004 -int style TextAppearanceMedium 0x7f0b0005 -int style TextAppearanceNormal 0x7f0b0006 -int style TextAppearancePrimaryItem 0x7f0b0007 -int style TextAppearanceSecondaryItem 0x7f0b0008 -int style TextAppearanceSuper 0x7f0b0009 -int style TextAppearanceUnderMenuIcon 0x7f0b000a -int xml preferences 0x7f0c0000 -int xml searchable 0x7f0c0001 -int xml widget_2x_info 0x7f0c0002 -int xml widget_4x_info 0x7f0c0003 diff --git a/src/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json deleted file mode 100644 index bb4deaa..0000000 --- a/src/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ /dev/null @@ -1 +0,0 @@ -{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt deleted file mode 100644 index 143e472..0000000 --- a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ /dev/null @@ -1,8 +0,0 @@ -net.micode.notes.app-pngs-0 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\res -net.micode.notes.app-main-7 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res diff --git a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt deleted file mode 100644 index 4461006..0000000 --- a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ /dev/null @@ -1,283 +0,0 @@ -net.micode.notes:xml/widget_4x_info = 0x7f0c0003 -net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 -net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 -net.micode.notes:string/ticker_syncing = 0x7f0a0063 -net.micode.notes:string/ticker_success = 0x7f0a0062 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 -net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 -net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 -net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/notelist_string_info = 0x7f0a0043 -net.micode.notes:string/notelist_menu_new = 0x7f0a0042 -net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/notealert_enter = 0x7f0a0040 -net.micode.notes:string/note_link_web = 0x7f0a003f -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:string/note_link_other = 0x7f0a003d -net.micode.notes:string/note_link_email = 0x7f0a003c -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:string/menu_select_none = 0x7f0a0033 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003a -net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/menu_search = 0x7f0a0031 -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f -net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:string/menu_move = 0x7f0a002d -net.micode.notes:string/menu_list_mode = 0x7f0a002c -net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:string/menu_deselect_all = 0x7f0a0022 -net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/folder_exist = 0x7f0a0017 -net.micode.notes:string/hint_foler_name = 0x7f0a001d -net.micode.notes:string/format_date_ymd = 0x7f0a0018 -net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/set_remind_time_message = 0x7f0a005a -net.micode.notes:string/error_sync_network = 0x7f0a0013 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:drawable/list_green_up = 0x7f040020 -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/new_note_normal = 0x7f040030 -net.micode.notes:string/button_delete = 0x7f0a0007 -net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a -net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:string/delete_remind_time_message = 0x7f0a000b -net.micode.notes:dimen/text_font_size_super = 0x7f030004 -net.micode.notes:drawable/selected = 0x7f040035 -net.micode.notes:plurals/search_results_title = 0x7f080000 -net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:menu/note_edit = 0x7f070002 -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 -net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:id/move = 0x7f05002e -net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 -net.micode.notes:menu/call_note_edit = 0x7f070000 -net.micode.notes:drawable/new_note_pressed = 0x7f040031 -net.micode.notes:id/iv_bg_blue = 0x7f05000e -net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:drawable/list_white_single = 0x7f040027 -net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:id/btn_new_note = 0x7f050004 -net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:id/widget_text = 0x7f050042 -net.micode.notes:id/tv_title_bar = 0x7f050040 -net.micode.notes:drawable/widget_2x_blue = 0x7f040038 -net.micode.notes:id/tv_time = 0x7f05003e -net.micode.notes:id/tv_name = 0x7f05003d -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:id/sv_note_edit = 0x7f050039 -net.micode.notes:id/selection_menu = 0x7f050038 -net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:id/preference_sync_button = 0x7f050037 -net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/notes_list = 0x7f050035 -net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:id/note_title = 0x7f050034 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f -net.micode.notes:id/note_edit_view = 0x7f050032 -net.micode.notes:id/navigation_bar = 0x7f05002f -net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:id/minute = 0x7f05002d -net.micode.notes:drawable/font_super = 0x7f040014 -net.micode.notes:id/menu_sync = 0x7f05002c -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:id/menu_share = 0x7f05002b -net.micode.notes:id/menu_setting = 0x7f05002a -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -net.micode.notes:id/menu_send_to_desktop = 0x7f050029 -net.micode.notes:id/menu_search = 0x7f050028 -net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:id/menu_new_note = 0x7f050027 -net.micode.notes:string/error_note_not_exist = 0x7f0a000e -net.micode.notes:id/menu_new_folder = 0x7f050026 -net.micode.notes:id/menu_list_mode = 0x7f050025 -net.micode.notes:id/iv_medium_select = 0x7f050019 -net.micode.notes:id/menu_export_text = 0x7f050023 -net.micode.notes:string/menu_folder_view = 0x7f0a0026 -net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:string/ticker_fail = 0x7f0a0061 -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 -net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:string/menu_alert = 0x7f0a001f -net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:id/menu_alert = 0x7f050020 -net.micode.notes:string/success_sync_account = 0x7f0a005c -net.micode.notes:id/ll_font_super = 0x7f05001f -net.micode.notes:id/ll_font_small = 0x7f05001e -net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:id/ll_font_normal = 0x7f05001d -net.micode.notes:id/ll_font_large = 0x7f05001c -net.micode.notes:id/note_bg_color_selector = 0x7f050030 -net.micode.notes:drawable/search_result = 0x7f040034 -net.micode.notes:id/iv_super_select = 0x7f05001b -net.micode.notes:id/iv_bg_yellow = 0x7f050016 -net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 -net.micode.notes:id/iv_bg_white_select = 0x7f050015 -net.micode.notes:id/tv_alert_date = 0x7f05003a -net.micode.notes:dimen/text_font_size_large = 0x7f030000 -net.micode.notes:drawable/notification = 0x7f040033 -net.micode.notes:id/iv_bg_red = 0x7f050012 -net.micode.notes:string/menu_font_large = 0x7f0a0027 -net.micode.notes:drawable/widget_4x_blue = 0x7f04003d -net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:id/widget_bg_image = 0x7f050041 -net.micode.notes:id/iv_bg_green_select = 0x7f050011 -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a -net.micode.notes:drawable/menu_move = 0x7f04002e -net.micode.notes:drawable/widget_4x_white = 0x7f040040 -net.micode.notes:id/iv_bg_blue_select = 0x7f05000f -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c -net.micode.notes:id/font_size_selector = 0x7f05000b -net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:id/et_foler_name = 0x7f05000a -net.micode.notes:drawable/edit_green = 0x7f040007 -net.micode.notes:layout/widget_4x = 0x7f06000d -net.micode.notes:string/search = 0x7f0a0056 -net.micode.notes:id/cb_edit_item = 0x7f050006 -net.micode.notes:id/btn_set_bg_color = 0x7f050005 -net.micode.notes:id/account_dialog_subtitle = 0x7f050000 -net.micode.notes:menu/note_list = 0x7f070003 -net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/iv_bg_green = 0x7f050010 -net.micode.notes:id/amPm = 0x7f050003 -net.micode.notes:drawable/widget_4x_green = 0x7f04003e -net.micode.notes:style/NoteTheme = 0x7f0b0003 -net.micode.notes:id/hour = 0x7f05000c -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 -net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c -net.micode.notes:drawable/widget_2x_red = 0x7f04003a -net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:id/delete = 0x7f050008 -net.micode.notes:drawable/widget_2x_green = 0x7f040039 -net.micode.notes:drawable/title_bar_bg = 0x7f040037 -net.micode.notes:drawable/menu_delete = 0x7f04002d -net.micode.notes:string/error_sync_internal = 0x7f0a0012 -net.micode.notes:drawable/list_green_single = 0x7f04001f -net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:id/tv_modified_date = 0x7f05003c -net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:id/iv_small_select = 0x7f05001a -net.micode.notes:menu/note_list_options = 0x7f070005 -net.micode.notes:xml/searchable = 0x7f0c0001 -net.micode.notes:string/menu_folder_delete = 0x7f0a0025 -net.micode.notes:drawable/dropdown_icon = 0x7f040005 -net.micode.notes:id/date = 0x7f050007 -net.micode.notes:drawable/list_yellow_single = 0x7f04002b -net.micode.notes:drawable/list_red_up = 0x7f040024 -net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 -net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:id/tv_folder_name = 0x7f05003b -net.micode.notes:drawable/list_yellow_down = 0x7f040029 -net.micode.notes:string/format_folder_files_count = 0x7f0a001b -net.micode.notes:drawable/clock = 0x7f040003 -net.micode.notes:drawable/list_white_up = 0x7f040028 -net.micode.notes:drawable/edit_title_blue = 0x7f040009 -net.micode.notes:drawable/edit_red = 0x7f040008 -net.micode.notes:id/iv_alert_icon = 0x7f05000d -net.micode.notes:layout/dialog_edit_text = 0x7f060003 -net.micode.notes:string/preferences_account_title = 0x7f0a0045 -net.micode.notes:drawable/edit_white = 0x7f04000e -net.micode.notes:drawable/list_white_middle = 0x7f040026 -net.micode.notes:color/user_query_highlight = 0x7f020002 -net.micode.notes:drawable/list_white_down = 0x7f040025 -net.micode.notes:string/preferences_add_account = 0x7f0a0046 -net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 -net.micode.notes:layout/widget_2x = 0x7f06000c -net.micode.notes:drawable/list_footer_bg = 0x7f04001c -net.micode.notes:string/alert_title_delete = 0x7f0a0003 -net.micode.notes:drawable/edit_title_green = 0x7f04000a -net.micode.notes:drawable/icon_app = 0x7f040015 -net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 -net.micode.notes:drawable/list_red_single = 0x7f040023 -net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 -net.micode.notes:drawable/widget_4x_red = 0x7f04003f -net.micode.notes:id/menu_delete_remind = 0x7f050022 -net.micode.notes:drawable/list_red_down = 0x7f040021 -net.micode.notes:drawable/list_red_middle = 0x7f040022 -net.micode.notes:id/iv_bg_white = 0x7f050014 -net.micode.notes:id/iv_bg_red_select = 0x7f050013 -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d -net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 -net.micode.notes:drawable/list_blue_down = 0x7f040017 -net.micode.notes:id/action_select_all = 0x7f050002 -net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 -net.micode.notes:drawable/font_small = 0x7f040013 -net.micode.notes:string/sync_progress_login = 0x7f0a005e -net.micode.notes:array/menu_share_ways = 0x7f010001 -net.micode.notes:drawable/widget_2x_white = 0x7f04003b -net.micode.notes:layout/folder_list_item = 0x7f060004 -net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/tv_title = 0x7f05003f -net.micode.notes:color/primary_text_dark = 0x7f020000 -net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 -net.micode.notes:drawable/list_blue_up = 0x7f04001a -net.micode.notes:string/search_setting_description = 0x7f0a0059 -net.micode.notes:drawable/list_blue_single = 0x7f040019 -net.micode.notes:drawable/font_large = 0x7f040010 -net.micode.notes:drawable/delete = 0x7f040004 -net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:id/note_item = 0x7f050033 -net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:id/note_edit_list = 0x7f050031 -net.micode.notes:drawable/edit_title_red = 0x7f04000b -net.micode.notes:string/menu_delete = 0x7f0a0021 -net.micode.notes:drawable/list_folder = 0x7f04001b -net.micode.notes:drawable/call_record = 0x7f040002 -net.micode.notes:string/search_hint = 0x7f0a0057 -net.micode.notes:id/menu_font_size = 0x7f050024 -net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 -net.micode.notes:drawable/list_yellow_up = 0x7f04002c -net.micode.notes:dimen/text_font_size_small = 0x7f030003 -net.micode.notes:dimen/text_font_size_normal = 0x7f030002 -net.micode.notes:drawable/list_green_middle = 0x7f04001e -net.micode.notes:drawable/list_background = 0x7f040016 -net.micode.notes:string/app_name = 0x7f0a0004 -net.micode.notes:menu/note_list_dropdown = 0x7f070004 -net.micode.notes:string/menu_setting = 0x7f0a0036 -net.micode.notes:dimen/text_font_size_medium = 0x7f030001 -net.micode.notes:layout/note_edit_list_item = 0x7f060006 -net.micode.notes:layout/account_dialog_title = 0x7f060000 -net.micode.notes:array/format_for_exported_note = 0x7f010000 diff --git a/src/Notes-master3/app/build/intermediates/variant_model/debug/variant_model.json b/src/Notes-master3/app/build/intermediates/variant_model/debug/variant_model.json deleted file mode 100644 index fbfb74a..0000000 Binary files a/src/Notes-master3/app/build/intermediates/variant_model/debug/variant_model.json and /dev/null differ diff --git a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index 00c3013..0000000 --- a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,255 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 - package - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31 - INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - android:versionName - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30 - INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - xmlns:tools - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51 - xmlns:android - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69 - android:versionCode - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28 - INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml -uses-sdk -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 - android:targetSdkVersion - INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 - INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - tools:ignore - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39 - android:minSdkVersion - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 - INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 -uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 -uses-permission#android.permission.INTERNET -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 -uses-permission#android.permission.READ_CONTACTS -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 -uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 -uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 -uses-permission#android.permission.GET_ACCOUNTS -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 -uses-permission#android.permission.USE_CREDENTIALS -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 -uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 -application -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 - android:label - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 - android:icon - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 -activity#net.micode.notes.ui.NotesListActivity -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 - android:launchMode - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 - android:windowSoftInputMode - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 - android:exported - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 - android:uiOptions - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 - android:configChanges - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 - android:theme - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 -intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 -action#android.intent.action.MAIN -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 -category#android.intent.category.LAUNCHER -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 -activity#net.micode.notes.ui.NoteEditActivity -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 - android:launchMode - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 - android:exported - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 - android:configChanges - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 - android:theme - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 -intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 - android:scheme - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 - tools:ignore - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47 -action#android.intent.action.VIEW -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 -category#android.intent.category.DEFAULT -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 -data -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 - android:mimeType - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 -intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 -action#android.intent.action.INSERT_OR_EDIT -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 -intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 -action#android.intent.action.SEARCH -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 -meta-data#android.app.searchable -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 - android:resource - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 -provider#net.micode.notes.data.NotesProvider -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 - android:authorities - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 - android:multiprocess - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 - android:exported - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 -receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 - android:label - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 - android:exported - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 -intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 -action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 -action#android.appwidget.action.APPWIDGET_DELETED -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 -meta-data#android.appwidget.provider -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 - android:resource - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 -receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 - android:label - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 - android:exported - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 -receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 - android:exported - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 -intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 -action#android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 -receiver#net.micode.notes.ui.AlarmReceiver -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 - android:process - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 -activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 - android:label - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 - android:launchMode - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 - tools:ignore - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42 - android:theme - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 -activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 - android:label - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 - android:launchMode - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 - android:theme - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 -service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 - android:exported - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 -meta-data#android.app.default_searchable -ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 - android:value - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 - android:name - ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin deleted file mode 100644 index 26037e0..0000000 Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and /dev/null differ diff --git a/src/Notes-master3/app/src/main/AndroidManifest.xml b/src/Notes-master3/app/src/main/AndroidManifest.xml deleted file mode 100644 index c733892..0000000 --- a/src/Notes-master3/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notes-master3/app/src/main/java/net/micode/notes/data/Contact.java deleted file mode 100644 index 68a4e6a..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/data/Contact.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.data; -/** - * 当前文件所在的包名 - */ - -import android.content.Context; -/** - * Context类是Android自带的类不在包里,就要用import android.content.Context;将它导入,就相当于自己写的类。后面的同理 - */ -import android.database.Cursor; -import android.provider.ContactsContract.CommonDataKinds.Phone; -import android.provider.ContactsContract.Data; -import android.telephony.PhoneNumberUtils; -import android.util.Log; - -import java.util.HashMap; - -/** - * 引用了STL里面的HashMap,用来映射联系人和电话号码 - */ -public class Contact - /** - * 通过两种方式访问联系人1.去数据库中2.去cache中,如果数据库中读了,将它存入cache中,和主存缓存机制类似 - */ -{ - private static HashMap sContactCache; - private static final String TAG = "Contact"; - - private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER - + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" - + " AND " + Data.RAW_CONTACT_ID + " IN " - + "(SELECT raw_contact_id " - + " FROM phone_lookup" - + " WHERE min_match = '+')"; - - /** - * 定义字符串CALLER_ID_SELECTION,用于匹配查找联系人 - * phone number - * data.mimetype 数据类型 - * item.type 联系人类型 - * 联系人ID - */ - - public static String getContact(Context context, String phoneNumber) /**获取联系人**/{ - if(sContactCache == null) /**联系人的cache为空,就初始化一个**/{ - sContactCache = new HashMap(); - } - - if(sContactCache.containsKey(phoneNumber)) /**查找cache中是否有phoneNumber对应的联系人信息**/{ - return sContactCache.get(phoneNumber); - } - - String selection = CALLER_ID_SELECTION.replace("+", - PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));/**toCallerIDMinMatch是安卓自带的号码匹配工具,截取查询号码的后7位作为匹配依据**/ - Cursor cursor = context.getContentResolver().query( - Data.CONTENT_URI, - new String [] { Phone.DISPLAY_NAME },/**这个参数告诉查询要返回的列(Column),Contacts Provider提供了联系人的ID和联系人的NAME等内容,在这里,我们只需要NAME,所以提供这个参数DISPLAY_NAME**/ - selection,/**selection,设置条件,相当于SQL语句中的where**/ - new String[] { phoneNumber }, - null); - - if (cursor != null && cursor.moveToFirst()) {/**若数据库存在,则游标移动到游标所表示的信息元组的第一行开始**/ - try {/**联系人姓名,并将相关信息存入cache中**/ - String name = cursor.getString(0); - sContactCache.put(phoneNumber, name); - return name; - } catch (IndexOutOfBoundsException e) {/**参数越界异常**/ - Log.e(TAG, " Cursor get string error " + e.toString()); - return null;/**引入的util.log就是java自带的日志输出工具,而log.e则代表error,显示的颜色为红色**/ - } finally { - cursor.close();/**关闭cursor游标**/ - } - } else { - Log.d(TAG, "No contact matched with number:" + phoneNumber); - return null; - } - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master3/app/src/main/java/net/micode/notes/data/Notes.java deleted file mode 100644 index e148c0f..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/data/Notes.java +++ /dev/null @@ -1,279 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.data; - -import android.net.Uri; -public class Notes { - public static final String AUTHORITY = "micode_notes"; - public static final String TAG = "Notes"; - public static final int TYPE_NOTE = 0; - public static final int TYPE_FOLDER = 1; - public static final int TYPE_SYSTEM = 2; - - /** - * 下面的id是系统文件夹的标识符 - * {@link Notes#ID_ROOT_FOLDER } 是默认文件夹 - * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder - * {@link Notes#ID_CALL_RECORD_FOLDER} 是存储通话记录 - */ - public static final int ID_ROOT_FOLDER = 0; - public static final int ID_TEMPARAY_FOLDER = -1; - public static final int ID_CALL_RECORD_FOLDER = -2; - public static final int ID_TRASH_FOLER = -3; - - public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; - public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; - public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id"; - public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type"; - public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id"; - public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; - - public static final int TYPE_WIDGET_INVALIDE = -1; - public static final int TYPE_WIDGET_2X = 0; - public static final int TYPE_WIDGET_4X = 1; - - public static class DataConstants { - public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; - public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; - } - - /** - Uri查询所有笔记和文件夹 - */ - public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); - - /** - * Uri用于查询数据 - */ - public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); - - public interface NoteColumns { - /** - *一行的唯一ID - *

Type: INTEGER (long)

- */ - public static final String ID = "_id"; - - /** - * *笔记或文件夹的父id - *

Type: INTEGER (long)

- */ - public static final String PARENT_ID = "parent_id"; - - /** - *为笔记或文件夹创建数据 - *

Type: INTEGER (long)

- */ - public static final String CREATED_DATE = "created_date"; - - /** - *最新修改日期 - *

Type: INTEGER (long)

- */ - public static final String MODIFIED_DATE = "modified_date"; - - - /** - *警报日期 - *

Type: INTEGER (long)

- */ - public static final String ALERTED_DATE = "alert_date"; - - /** - *文件夹的名称或文本内容的说明 - *

Type: TEXT

- */ - public static final String SNIPPET = "snippet"; - - /** - * Note的小部件id - *

Type: INTEGER (long)

- */ - public static final String WIDGET_ID = "widget_id"; - - /** - * Note的小部件类型 - *

Type: INTEGER (long)

- */ - public static final String WIDGET_TYPE = "widget_type"; - - /** - *笔记的背景颜色的id - *

Type: INTEGER (long)

- */ - public static final String BG_COLOR_ID = "bg_color_id"; - - /** - *对于文本笔记,它没有附件,对于多媒体 - *注意,它至少有一个附件 - *

Type: INTEGER

- */ - public static final String HAS_ATTACHMENT = "has_attachment"; - - /** - *文件夹的注释计数 - *

Type: INTEGER (long)

- */ - public static final String NOTES_COUNT = "notes_count"; - - /** - *文件类型:文件夹或便签 - *

Type: INTEGER

- */ - public static final String TYPE = "type"; - - /** - *最后一个同步id - *

Type: INTEGER (long)

- */ - public static final String SYNC_ID = "sync_id"; - - /** - *符号表示本地是否被修改 - *

Type: INTEGER

- */ - public static final String LOCAL_MODIFIED = "local_modified"; - - /** - *移动到临时文件夹前的原始父id - *

Type : INTEGER

- */ - public static final String ORIGIN_PARENT_ID = "origin_parent_id"; - - /** - * gtask id - *

Type : TEXT

- */ - public static final String GTASK_ID = "gtask_id"; - - /** - * The version code - * *

Type : INTEGER (long)

- */ - public static final String VERSION = "version"; - } - - public interface DataColumns { - /** - *一行的唯一ID - *

Type: INTEGER (long)

- */ - public static final String ID = "_id"; - - /** - *由这一行表示的项目的MIME类型。 - *

Type: Text

- */ - public static final String MIME_TYPE = "mime_type"; - - /** - *该数据所属的引用id - *

Type: INTEGER (long)

- */ - public static final String NOTE_ID = "note_id"; - - /** - *为笔记或文件夹创建数据 - *

Type: INTEGER (long)

- */ - public static final String CREATED_DATE = "created_date"; - - /** - *最新修改日期 - *

Type: INTEGER (long)

- */ - public static final String MODIFIED_DATE = "modified_date"; - - /** - *数据内容 - *

Type: TEXT

- */ - public static final String CONTENT = "content"; - - - /** - *泛型数据列,含义是{@link #MIMETYPE}特定的,用于 - 整数数据类型 - *

Type: INTEGER

- */ - public static final String DATA1 = "data1"; - - /** - *泛型数据列,含义是{@link #MIMETYPE}特定的,用于 - 整数数据类型 - *

Type: INTEGER

- */ - public static final String DATA2 = "data2"; - - /** - *泛型数据列,含义是{@link #MIMETYPE}特定的,用于 - * TEXT数据类型 - *

Type: TEXT

- */ - public static final String DATA3 = "data3"; - - /** - *泛型数据列,含义是{@link #MIMETYPE}特定的,用于 - * TEXT数据类型 - *

Type: TEXT

- */ - public static final String DATA4 = "data4"; - - /** - *泛型数据列,含义是{@link #MIMETYPE}特定的,用于 - * TEXT数据类型 - *

Type: TEXT

- */ - public static final String DATA5 = "data5"; - } - - public static final class TextNote implements DataColumns { - /** - *模式,表示文本是否处于检查列表模式 - *

Type: Integer 1:check list mode 0: normal mode

- */ - public static final String MODE = DATA1; - - public static final int MODE_CHECK_LIST = 1; - - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note"; - - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; - - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); - } - - public static final class CallNote implements DataColumns { - /** - *此记录的呼叫日期 - *

Type: INTEGER (long)

- */ - public static final String CALL_DATE = DATA1; - - /** - *此记录的电话号码 - *

Type: TEXT

- */ - public static final String PHONE_NUMBER = DATA3; - - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; - - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; - - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master3/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java deleted file mode 100644 index 2ebd68e..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ /dev/null @@ -1,365 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.data;/**1.数据库操作,SQLOpenhelper,对一些note和文件进行数据库的操作。比如删除文件后,将文件里的note也相应删除**/ - - -import android.content.ContentValues; -import android.content.Context; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; - -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.DataConstants; -import net.micode.notes.data.Notes.NoteColumns; - - -public class NotesDatabaseHelper extends SQLiteOpenHelper {/**2.继承于SQLiteOpenHelper的类NotesDatabaseHelper,用于实现对便签或者 文件的数据库操作,例如删除便签**/ - - private static final String DB_NAME = "note.db";/**2.定义数据库的名称为“note.db”**/ - - private static final int DB_VERSION = 4; - - public interface TABLE {/**1.接口,分成note和data,在后面的程序里分别使用过**/ - public static final String NOTE = "note";/**2.数据库中创建的note表信息**/ - - public static final String DATA = "data"; - } - - private static final String TAG = "NotesDatabaseHelper"; - - private static NotesDatabaseHelper mInstance; - - private static final String CREATE_NOTE_TABLE_SQL = /**1.SQL的触发器是一个能由系统自动执行对数据库修改的语句,由文件的增加事件触发。文件夹中移入一个Note之后需要更改的数据的表格。**/ - "CREATE TABLE " + TABLE.NOTE + "(" + - NoteColumns.ID + " INTEGER PRIMARY KEY," + - NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + - NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + - ")"; - - private static final String CREATE_DATA_TABLE_SQL =/**3. 创建SQL的data表。下面是表头**/ - "CREATE TABLE " + TABLE.DATA + "(" + - DataColumns.ID + " INTEGER PRIMARY KEY," + - DataColumns.MIME_TYPE + " TEXT NOT NULL," + - DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA1 + " INTEGER," + - DataColumns.DATA2 + " INTEGER," + - DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + - ")"; - - private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =/**1.文件夹移除note时触发垃圾回收**/ - "CREATE INDEX IF NOT EXISTS note_id_index ON " + - TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; - - /** - * Increase folder's note count when move note to the folder - */ - private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =/**4. 构建一条SQL语句,实现当note移动到文件夹中时,文件夹的数量增加的功能**/ - "CREATE TRIGGER increase_folder_count_on_update "+ - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; - - /** - *减少文件夹的笔记数时,移动笔记从文件夹 - */ - private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_update " + - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + - " END"; - - /** - *增加文件夹的笔记计数时,插入新的笔记到文件夹 - */ - private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_insert " + - " AFTER INSERT ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; - - /** - *从文件夹中删除笔记时减少文件夹的笔记数量 - */ - private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0;" + - " END"; - - /** - *当插入类型为{@link DataConstants# note}的数据时,更新note的内容 - */ - private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = - "CREATE TRIGGER update_note_content_on_insert " + - " AFTER INSERT ON " + TABLE.DATA + - " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; - - /** - *当{@link DataConstants# note}类型的数据发生变化时更新note的内容 - */ - private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER update_note_content_on_update " + - " AFTER UPDATE ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; - - /** - *当{@link DataConstants# note}类型的数据被删除时,更新note的内容 - */ - private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = - "CREATE TRIGGER update_note_content_on_delete " + - " AFTER delete ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=''" + - " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + - " END"; - - /** - *删除属于已删除笔记的数据 - */ - private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = - "CREATE TRIGGER delete_data_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.DATA + - " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + - " END"; - - /** - *删除笔记属于已删除的文件夹 - */ - private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = - "CREATE TRIGGER folder_delete_notes_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.NOTE + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; - - /** - *移动笔记属于文件夹已移动到垃圾文件夹 - */ - private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = - "CREATE TRIGGER folder_move_notes_on_trash " + - " AFTER UPDATE ON " + TABLE.NOTE + - " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; - - public NotesDatabaseHelper(Context context) { - super(context, DB_NAME, null, DB_VERSION); - } - - public void createNoteTable(SQLiteDatabase db) { - db.execSQL(CREATE_NOTE_TABLE_SQL); - reCreateNoteTableTriggers(db); - createSystemFolder(db); - Log.d(TAG, "note table has been created"); - } - - private void reCreateNoteTableTriggers(SQLiteDatabase db) { - db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); - db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); - db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert"); - db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash"); - - db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); - db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); - db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER); - db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER); - db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER); - db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER); - db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); - } - - private void createSystemFolder(SQLiteDatabase db) { - ContentValues values = new ContentValues(); - - /** - *通话记录文件夹用于通话记录 - */ - values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - - /** - *根文件夹,这是默认文件夹 - */ - values.clear(); - values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - - /** - *用于移动笔记的临时文件夹 - */ - values.clear(); - values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - - /** - *创建垃圾文件夹 - */ - values.clear(); - values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - } - - public void createDataTable(SQLiteDatabase db) {/**1.创建表格(用来存储标签内容) -**/ - db.execSQL(CREATE_DATA_TABLE_SQL); - reCreateDataTableTriggers(db); - db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL); - Log.d(TAG, "data table has been created"); - } - - private void reCreateDataTableTriggers(SQLiteDatabase db) {/**2. 重构数据库的data表单的触发器,防止定义冲突**/ - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete"); - - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER); - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER); - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); - } - - static synchronized NotesDatabaseHelper getInstance(Context context) { - if (mInstance == null) { - mInstance = new NotesDatabaseHelper(context); - } - return mInstance; - }/**1.如果NotesDatabaseHelper的实例创建失败,那就重新建一个,重新分配内从空间**/ - - @Override - public void onCreate(SQLiteDatabase db) { - createNoteTable(db); - createDataTable(db); - }/**5. 在对象生命周期开始的时候,onCreate被系统调用,所以这里重写这个函数,生成两个数据库表单,一个是便签表单,另一个是数据表单**/ - - @Override/**1.数据库版本的更新,包括数据库内容的更改**/ - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - boolean reCreateTriggers = false; - boolean skipV2 = false; - - if (oldVersion == 1) { - upgradeToV2(db); - skipV2 = true; // this upgrade including the upgrade from v2 to v3 - oldVersion++; - } - - if (oldVersion == 2 && !skipV2) { - upgradeToV3(db); - reCreateTriggers = true; - oldVersion++; - } - - if (oldVersion == 3) { - upgradeToV4(db); - oldVersion++; - } - - if (reCreateTriggers) { - reCreateNoteTableTriggers(db); - reCreateDataTableTriggers(db); - } - - if (oldVersion != newVersion) { - throw new IllegalStateException("Upgrade notes database to version " + newVersion - + "fails"); - } - } - - private void upgradeToV2(SQLiteDatabase db) { - db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); - db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); - createNoteTable(db); - createDataTable(db); - } - - private void upgradeToV3(SQLiteDatabase db) { - // drop unused triggers - db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update"); - // add a column for gtask id - db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID - + " TEXT NOT NULL DEFAULT ''"); - // add a trash system folder - ContentValues values = new ContentValues(); - values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - } - - private void upgradeToV4(SQLiteDatabase db) { - db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION - + " INTEGER NOT NULL DEFAULT 0"); - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master3/app/src/main/java/net/micode/notes/data/NotesProvider.java deleted file mode 100644 index 6897999..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ /dev/null @@ -1,320 +0,0 @@ -package net.micode.notes.data; - -import android.app.SearchManager; -import android.content.ContentProvider; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Intent; -import android.content.UriMatcher; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.net.Uri; -import android.text.TextUtils; -import android.util.Log; - -import net.micode.notes.R; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.data.NotesDatabaseHelper.TABLE; -//为存储和获取数据提供接口。可以在不同的应用程序之间共享数据 -//ContentProvider提供的方法 -//query:查询 -//insert:插入 -//update:更新 -//delete:删除 -//getType:得到数据类型 -public class NotesProvider extends ContentProvider { - // UriMatcher用于匹配Uri - private static final UriMatcher mMatcher; - - private NotesDatabaseHelper mHelper; - - private static final String TAG = "NotesProvider"; - - private static final int URI_NOTE = 1; - private static final int URI_NOTE_ITEM = 2; - private static final int URI_DATA = 3; - private static final int URI_DATA_ITEM = 4; - - private static final int URI_SEARCH = 5; - private static final int URI_SEARCH_SUGGEST = 6; - - static { - // 创建UriMatcher时,调用UriMatcher(UriMatcher.NO_MATCH)表示不匹配任何路径的返回码 - mMatcher = new UriMatcher(UriMatcher.NO_MATCH); - // 把需要匹配Uri路径全部给注册上 - mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); - mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM); - mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA); - mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM); - mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH); - mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST); - mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST); - } - - /** - * x'0A' represents the '\n' character in sqlite. For title and content in the search result, - * we will trim '\n' and white space in order to show more information. - */ - // 声明 NOTES_SEARCH_PROJECTION - private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," - + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," - + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," - + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + "," - + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," - + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," - + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; - // 声明NOTES_SNIPPET_SEARCH_QUERY - private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION - + " FROM " + TABLE.NOTE - + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" - + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER - + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; - - @Override - // Context只有在onCreate()中才被初始化 - // 对mHelper进行实例化 - public boolean onCreate() { - mHelper = NotesDatabaseHelper.getInstance(getContext()); - return true; - } - - @Override - // 查询uri在数据库中对应的位置 - public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, - String sortOrder) { - Cursor c = null; - // 获取可读数据库 - SQLiteDatabase db = mHelper.getReadableDatabase(); - String id = null; - // 匹配查找uri - switch (mMatcher.match(uri)) { - // 对于不同的匹配值,在数据库中查找相应的条目 - case URI_NOTE: - c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, - sortOrder); - break; - case URI_NOTE_ITEM: - id = uri.getPathSegments().get(1); - c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id - + parseSelection(selection), selectionArgs, null, null, sortOrder); - break; - case URI_DATA: - c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null, - sortOrder); - break; - case URI_DATA_ITEM: - id = uri.getPathSegments().get(1); - c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id - + parseSelection(selection), selectionArgs, null, null, sortOrder); - break; - case URI_SEARCH: - case URI_SEARCH_SUGGEST: - if (sortOrder != null || projection != null) { - // 不合法的参数异常 - throw new IllegalArgumentException( - "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); - } - - String searchString = null; - if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { - if (uri.getPathSegments().size() > 1) { - // getPathSegments()方法得到一个String的List, - // 在uri.getPathSegments().get(1)为第2个元素 - searchString = uri.getPathSegments().get(1); - } - } else { - searchString = uri.getQueryParameter("pattern"); - } - - if (TextUtils.isEmpty(searchString)) { - return null; - } - - try { - searchString = String.format("%%%s%%", searchString); - c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY, - new String[] { searchString }); - } catch (IllegalStateException ex) { - Log.e(TAG, "got exception: " + ex.toString()); - } - break; - default: - // 抛出异常 - throw new IllegalArgumentException("Unknown URI " + uri); - } - if (c != null) { - c.setNotificationUri(getContext().getContentResolver(), uri); - } - return c; - } - - @Override - // 插入一个uri - public Uri insert(Uri uri, ContentValues values) { - // 获得可写的数据库 - SQLiteDatabase db = mHelper.getWritableDatabase(); - long dataId = 0, noteId = 0, insertedId = 0; - switch (mMatcher.match(uri)) { - // 新增一个条目 - case URI_NOTE: - insertedId = noteId = db.insert(TABLE.NOTE, null, values); - break; - // 如果存在,查找NOTE_ID - case URI_DATA: - if (values.containsKey(DataColumns.NOTE_ID)) { - noteId = values.getAsLong(DataColumns.NOTE_ID); - } else { - Log.d(TAG, "Wrong data format without note id:" + values.toString()); - } - insertedId = dataId = db.insert(TABLE.DATA, null, values); - break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); - } - // Notify the note uri - // notifyChange获得一个ContextResolver对象并且更新里面的内容 - if (noteId > 0) { - getContext().getContentResolver().notifyChange( - ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null); - } - - // Notify the data uri - if (dataId > 0) { - getContext().getContentResolver().notifyChange( - ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null); - } - - // 返回插入的uri的路径 - return ContentUris.withAppendedId(uri, insertedId); - } - - @Override - // 删除一个uri - public int delete(Uri uri, String selection, String[] selectionArgs) { - //Uri代表要操作的数据,Android上可用的每种资源 -包括 图像、视频片段、音频资源等都可以用Uri来表示。 - int count = 0; - String id = null; - // 获得可写的数据库 - SQLiteDatabase db = mHelper.getWritableDatabase(); - boolean deleteData = false; - switch (mMatcher.match(uri)) { - case URI_NOTE: - selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 "; - count = db.delete(TABLE.NOTE, selection, selectionArgs); - break; - case URI_NOTE_ITEM: - id = uri.getPathSegments().get(1); - /** - * ID that smaller than 0 is system folder which is not allowed to - * trash - */ - long noteId = Long.valueOf(id); - if (noteId <= 0) { - break; - } - count = db.delete(TABLE.NOTE, - NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); - break; - case URI_DATA: - count = db.delete(TABLE.DATA, selection, selectionArgs); - deleteData = true; - break; - case URI_DATA_ITEM: - id = uri.getPathSegments().get(1); - count = db.delete(TABLE.DATA, - DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs); - deleteData = true; - break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); - } - if (count > 0) { - if (deleteData) { - getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); - } - getContext().getContentResolver().notifyChange(uri, null); - } - return count; - } - - @Override - // 更新一个uri - public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { - int count = 0; - String id = null; - SQLiteDatabase db = mHelper.getWritableDatabase(); - boolean updateData = false; - switch (mMatcher.match(uri)) { - case URI_NOTE: - increaseNoteVersion(-1, selection, selectionArgs); - count = db.update(TABLE.NOTE, values, selection, selectionArgs); - break; - case URI_NOTE_ITEM: - id = uri.getPathSegments().get(1); - increaseNoteVersion(Long.valueOf(id), selection, selectionArgs); - count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id - + parseSelection(selection), selectionArgs); - break; - case URI_DATA: - count = db.update(TABLE.DATA, values, selection, selectionArgs); - updateData = true; - break; - case URI_DATA_ITEM: - id = uri.getPathSegments().get(1); - count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id - + parseSelection(selection), selectionArgs); - updateData = true; - break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); - } - - if (count > 0) { - if (updateData) { - getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); - } - getContext().getContentResolver().notifyChange(uri, null); - } - return count; - } - - // 将字符串解析成规定格式 - private String parseSelection(String selection) { - return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); - } - - //增加一个noteVersion - private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { - StringBuilder sql = new StringBuilder(120); - sql.append("UPDATE "); - sql.append(TABLE.NOTE); - sql.append(" SET "); - sql.append(NoteColumns.VERSION); - sql.append("=" + NoteColumns.VERSION + "+1 "); - - if (id > 0 || !TextUtils.isEmpty(selection)) { - sql.append(" WHERE "); - } - if (id > 0) { - sql.append(NoteColumns.ID + "=" + String.valueOf(id)); - } - if (!TextUtils.isEmpty(selection)) { - String selectString = id > 0 ? parseSelection(selection) : selection; - for (String args : selectionArgs) { - selectString = selectString.replaceFirst("\\?", args); - } - sql.append(selectString); - } - - // execSQL()方法可以执行insert、delete、update和CREATE TABLE之类有更改行为的SQL语句 - mHelper.getWritableDatabase().execSQL(sql.toString()); - } - - @Override - public String getType(Uri uri) { - // TODO Auto-generated method stub - return null; - } - -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/MetaData.java deleted file mode 100644 index f53bf4c..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/MetaData.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.data; - -import android.database.Cursor; -import android.util.Log; - -import net.micode.notes.tool.GTaskStringUtils; - -import org.json.JSONException; -import org.json.JSONObject; - - - -public class MetaData extends Task { - /* - * 功能描述:得到类的简写名称存入字符串TAG中 - * 实现过程:调用getSimpleName ()函数 - */ - private final static String TAG = MetaData.class.getSimpleName(); - private String mRelatedGid = null; - /* - * 功能描述:设置数据,即生成元数据库 - * 实现过程:调用JSONObject库函数put (),Task类中的setNotes ()和setName ()函数 - * 参数注解: - */ - public void setMeta(String gid, JSONObject metaInfo) - { - //对函数块进行注释 - try { - metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid); - /* - * 将这对键值放入metaInfo这个jsonobject对象中 - */ - } catch (JSONException e) { - Log.e(TAG, "failed to put related gid"); - /* - * 输出错误信息 - */ - } - setNotes(metaInfo.toString()); - setName(GTaskStringUtils.META_NOTE_NAME); - } - /* - * 功能描述:获取相关联的Gid - */ - public String getRelatedGid() { - return mRelatedGid; - } - /* - * 功能描述:判断当前数据是否为空,若为空则返回真即值得保存 - */ - @Override - public boolean isWorthSaving() { - return getNotes() != null; - } - /* - * 功能描述:使用远程json数据对象设置元数据内容 - * 实现过程:调用父类Task中的setContentByRemoteJSON ()函数,并 - * 参数注解: - */ - @Override - public void setContentByRemoteJSON(JSONObject js) { - super.setContentByRemoteJSON(js); - if (getNotes() != null) { - try { - JSONObject metaInfo = new JSONObject(getNotes().trim()); - mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID); - } catch (JSONException e) { - Log.w(TAG, "failed to get related gid"); - /* - * 输出警告信息 - */ - mRelatedGid = null; - } - } - } - /* - * 功能描述:使用本地json数据对象设置元数据内容,一般不会用到,若用到,则抛出异常 - */ - @Override - public void setContentByLocalJSON(JSONObject js) { - // this function should not be called - throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called"); - /* - * 传递非法参数异常 - */ - } - /* - * 功能描述:从元数据内容中获取本地json对象,一般不会用到,若用到,则抛出异常 - */ - @Override - public JSONObject getLocalJSONFromContent() { - throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called"); - /* - * 传递非法参数异常 - */ - } - /* - * 功能描述:获取同步动作状态,一般不会用到,若用到,则抛出异常 - */ - @Override - public int getSyncAction(Cursor c) { - throw new IllegalAccessError("MetaData:getSyncAction should not be called"); - /* - * 传递非法参数异常 - */ - } - -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Node.java deleted file mode 100644 index 47f7461..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Node.java +++ /dev/null @@ -1,90 +0,0 @@ -package net.micode.notes.gtask.data; - -import android.database.Cursor; - -import org.json.JSONObject; - -/** - * 应该是同步操作的基础数据类型,定义了相关指示同步操作的常量 - * 关键字:abstract - */ -public abstract class Node { - //定义了各种用于表征同步状态的常量 - public static final int SYNC_ACTION_NONE = 0;// 本地和云端都无可更新内容(即本地和云端内容一致) - - public static final int SYNC_ACTION_ADD_REMOTE = 1;// 需要在远程云端增加内容 - - public static final int SYNC_ACTION_ADD_LOCAL = 2;// 需要在本地增加内容 - - public static final int SYNC_ACTION_DEL_REMOTE = 3;// 需要在远程云端删除内容 - - public static final int SYNC_ACTION_DEL_LOCAL = 4;// 需要在本地删除内容 - - public static final int SYNC_ACTION_UPDATE_REMOTE = 5;// 需要将本地内容更新到远程云端 - - public static final int SYNC_ACTION_UPDATE_LOCAL = 6;// 需要将远程云端内容更新到本地 - - public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;// 同步出现冲突 - - public static final int SYNC_ACTION_ERROR = 8;// 同步出现错误 - - private String mGid; - - private String mName; - - private long mLastModified;//记录最后一次修改时间 - - private boolean mDeleted;//表征是否被删除 - - public Node() { - mGid = null; - mName = ""; - mLastModified = 0; - mDeleted = false; - } - - public abstract JSONObject getCreateAction(int actionId); - - public abstract JSONObject getUpdateAction(int actionId); - - public abstract void setContentByRemoteJSON(JSONObject js); - - public abstract void setContentByLocalJSON(JSONObject js); - - public abstract JSONObject getLocalJSONFromContent(); - - public abstract int getSyncAction(Cursor c); - - public void setGid(String gid) { - this.mGid = gid; - } - - public void setName(String name) { - this.mName = name; - } - - public void setLastModified(long lastModified) { - this.mLastModified = lastModified; - } - - public void setDeleted(boolean deleted) { - this.mDeleted = deleted; - } - - public String getGid() { - return this.mGid; - } - - public String getName() { - return this.mName; - } - - public long getLastModified() { - return this.mLastModified; - } - - public boolean getDeleted() { - return this.mDeleted; - } - -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlData.java deleted file mode 100644 index dea514a..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlData.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.data; - -import android.content.ContentResolver; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.net.Uri; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.DataConstants; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.data.NotesDatabaseHelper.TABLE; -import net.micode.notes.gtask.exception.ActionFailureException; - -import org.json.JSONException; -import org.json.JSONObject; - - -public class SqlData { - private static final String TAG = SqlData.class.getSimpleName(); - - private static final int INVALID_ID = -99999;//为mDataId置初始值-99999 - - - /** - * 来自Notes类中定义的DataColumn中的一些常量 - */ - - // 集合了interface DataColumns中所有SF常量 - public static final String[] PROJECTION_DATA = new String[] { - DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1, - DataColumns.DATA3 - }; - - /** - * 以下五个变量作为sql表中5列的编号 - */ - public static final int DATA_ID_COLUMN = 0; - - public static final int DATA_MIME_TYPE_COLUMN = 1; - - public static final int DATA_CONTENT_COLUMN = 2; - - public static final int DATA_CONTENT_DATA_1_COLUMN = 3; - - public static final int DATA_CONTENT_DATA_3_COLUMN = 4; - - private ContentResolver mContentResolver; - //判断是否直接用Content生成,是为true,否则为false - private boolean mIsCreate; - - private long mDataId; - - private String mDataMimeType; - - private String mDataContent; - - private long mDataContentData1; - - private String mDataContentData3; - - private ContentValues mDiffDataValues; - - /* - * 功能描述:构造函数,用于初始化数据 - * 参数注解:mContentResolver用于获取ContentProvider提供的数据 - * 参数注解: mIsCreate表征当前数据是用哪种方式创建(两种构造函数的参数不同) - * 参数注解: - */ - public SqlData(Context context) { - mContentResolver = context.getContentResolver(); - mIsCreate = true; - mDataId = INVALID_ID;//mDataId置初始值-99999 - mDataMimeType = DataConstants.NOTE; - mDataContent = ""; - mDataContentData1 = 0; - mDataContentData3 = ""; - mDiffDataValues = new ContentValues(); - } - - - /* - * 功能描述:构造函数,初始化数据 - * 参数注解:mContentResolver用于获取ContentProvider提供的数据 - * 参数注解: mIsCreate表征当前数据是用哪种方式创建(两种构造函数的参数不同) - * 参数注解: - */ - public SqlData(Context context, Cursor c) { - mContentResolver = context.getContentResolver(); - mIsCreate = false; - loadFromCursor(c); - mDiffDataValues = new ContentValues(); - } - - /* - * 功能描述:从光标处加载数据 - * 从当前的光标处将五列的数据加载到该类的对象 - */ - private void loadFromCursor(Cursor c) { - mDataId = c.getLong(DATA_ID_COLUMN); - mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN); - mDataContent = c.getString(DATA_CONTENT_COLUMN); - mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN); - mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN); - } - - - /* - * 功能描述:设置用于共享的数据,并提供异常抛出与处理机制 - * 参数注解: - */ - public void setContent(JSONObject js) throws JSONException { - //如果传入的JSONObject对象中有DataColumns.ID这一项,则设置,否则设为INVALID_ID - long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID; - if (mIsCreate || mDataId != dataId) { - mDiffDataValues.put(DataColumns.ID, dataId); - } - mDataId = dataId; - - String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE) - : DataConstants.NOTE; - if (mIsCreate || !mDataMimeType.equals(dataMimeType)) { - mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType); - } - mDataMimeType = dataMimeType; - - String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : ""; - if (mIsCreate || !mDataContent.equals(dataContent)) { - mDiffDataValues.put(DataColumns.CONTENT, dataContent); - } - mDataContent = dataContent; - - long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0; - if (mIsCreate || mDataContentData1 != dataContentData1) { - mDiffDataValues.put(DataColumns.DATA1, dataContentData1); - } - mDataContentData1 = dataContentData1; - - String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : ""; - if (mIsCreate || !mDataContentData3.equals(dataContentData3)) { - mDiffDataValues.put(DataColumns.DATA3, dataContentData3); - } - mDataContentData3 = dataContentData3; - } - - - /* - * 功能描述:获取共享的数据内容,并提供异常抛出与处理机制 - * 参数注解: - */ - public JSONObject getContent() throws JSONException { - if (mIsCreate) { - Log.e(TAG, "it seems that we haven't created this in database yet"); - return null; - } - //创建JSONObject对象。并将相关数据放入其中,并返回。 - JSONObject js = new JSONObject(); - js.put(DataColumns.ID, mDataId); - js.put(DataColumns.MIME_TYPE, mDataMimeType); - js.put(DataColumns.CONTENT, mDataContent); - js.put(DataColumns.DATA1, mDataContentData1); - js.put(DataColumns.DATA3, mDataContentData3); - return js; - } - - /* - * 功能描述:commit函数用于把当前造作所做的修改保存到数据库 - * 参数注解: - */ - public void commit(long noteId, boolean validateVersion, long version) { - - if (mIsCreate) { - if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) { - mDiffDataValues.remove(DataColumns.ID); - } - - mDiffDataValues.put(DataColumns.NOTE_ID, noteId); - Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues); - try { - mDataId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { - Log.e(TAG, "Get note id error :" + e.toString()); - throw new ActionFailureException("create note failed"); - } - } else { - if (mDiffDataValues.size() > 0) { - int result = 0; - if (!validateVersion) { - result = mContentResolver.update(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null); - } else { - result = mContentResolver.update(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, - " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE - + " WHERE " + NoteColumns.VERSION + "=?)", new String[] { - String.valueOf(noteId), String.valueOf(version) - }); - } - if (result == 0) { - Log.w(TAG, "there is no update. maybe user updates note when syncing"); - } - } - } - - mDiffDataValues.clear(); - mIsCreate = false; - } - - /* - * 功能描述:获取当前id - * 实现过程: - * 参数注解: - */ - public long getId() { - return mDataId; - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java deleted file mode 100644 index 2a9304d..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java +++ /dev/null @@ -1,606 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.data; - -import android.appwidget.AppWidgetManager; -import android.content.ContentResolver; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.net.Uri; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.tool.GTaskStringUtils; -import net.micode.notes.tool.ResourceParser; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; - - -/* - * Description:用于支持小米便签最底层的数据库相关操作,和sqldata的关系上是父集关系,即note是data的子父集。 - * 和SqlData相比,SqlNote算是真正意义上的数据了。 - */ - - - -public class SqlNote { - private static final String TAG = SqlNote.class.getSimpleName(); - - private static final int INVALID_ID = -99999; - // 集合了interface NoteColumns中所有SF常量(17个) - public static final String[] PROJECTION_NOTE = new String[] { - NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID, - NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE, - NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE, - NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID, - NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID, - NoteColumns.VERSION - }; - - //以下设置17个列的编号 - public static final int ID_COLUMN = 0; - - public static final int ALERTED_DATE_COLUMN = 1; - - public static final int BG_COLOR_ID_COLUMN = 2; - - public static final int CREATED_DATE_COLUMN = 3; - - public static final int HAS_ATTACHMENT_COLUMN = 4; - - public static final int MODIFIED_DATE_COLUMN = 5; - - public static final int NOTES_COUNT_COLUMN = 6; - - public static final int PARENT_ID_COLUMN = 7; - - public static final int SNIPPET_COLUMN = 8; - - public static final int TYPE_COLUMN = 9; - - public static final int WIDGET_ID_COLUMN = 10; - - public static final int WIDGET_TYPE_COLUMN = 11; - - public static final int SYNC_ID_COLUMN = 12; - - public static final int LOCAL_MODIFIED_COLUMN = 13; - - public static final int ORIGIN_PARENT_ID_COLUMN = 14; - - public static final int GTASK_ID_COLUMN = 15; - - public static final int VERSION_COLUMN = 16; - - //一下定义了17个内部的变量,其中12个可以由content中获得,5个需要初始化为0或者new - private Context mContext; - - private ContentResolver mContentResolver; - - private boolean mIsCreate; - - private long mId; - - private long mAlertDate; - - private int mBgColorId; - - private long mCreatedDate; - - private int mHasAttachment; - - private long mModifiedDate; - - private long mParentId; - - private String mSnippet; - - private int mType; - - private int mWidgetId; - - private int mWidgetType; - - private long mOriginParent; - - private long mVersion; - - private ContentValues mDiffNoteValues; - - private ArrayList mDataList; - - /* - * 功能描述:构造函数 - * 参数注解: mIsCreate用于标示构造方式 - * 参数注解: - * Made By CuiCan - */ - //构造函数只有context,对所有的变量进行初始化 - public SqlNote(Context context) { - mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = true; - mId = INVALID_ID; - mAlertDate = 0; - mBgColorId = ResourceParser.getDefaultBgId(context); - mCreatedDate = System.currentTimeMillis();//调用系统函数获得创建时间 - mHasAttachment = 0; - mModifiedDate = System.currentTimeMillis();//最后一次修改时间初始化为创建时间 - mParentId = 0; - mSnippet = ""; - mType = Notes.TYPE_NOTE; - mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID; - mWidgetType = Notes.TYPE_WIDGET_INVALIDE; - mOriginParent = 0; - mVersion = 0; - mDiffNoteValues = new ContentValues(); - mDataList = new ArrayList(); - } - - - /* - * 功能描述:构造函数 - * 参数注解: mIsCreate用于标示构造方式 - * 参数注解: - * Made By CuiCan - */ - //构造函数有context和一个数据库的cursor,多数变量通过cursor指向的一条记录直接进行初始化 - public SqlNote(Context context, Cursor c) { - mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = false; - loadFromCursor(c); - mDataList = new ArrayList(); - // - if (mType == Notes.TYPE_NOTE) - loadDataContent(); - mDiffNoteValues = new ContentValues(); - } - - - /* - * 功能描述:构造函数 - * 参数注解: mIsCreate用于标示构造方式 - * 参数注解: - * Made By CuiCan - */ - public SqlNote(Context context, long id) { - mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = false; - loadFromCursor(id); - mDataList = new ArrayList(); - if (mType == Notes.TYPE_NOTE) - loadDataContent(); - mDiffNoteValues = new ContentValues(); - - } - - /* - * 功能描述:通过id从光标处加载数据 - * Made By CuiCan - */ - private void loadFromCursor(long id) { - Cursor c = null; - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)", - new String[] { - String.valueOf(id) - }, null);//通过id获得对应的ContentResolver中的cursor - if (c != null) { - c.moveToNext(); - loadFromCursor(c);//然后加载数据进行初始化,这样函数 - //SqlNote(Context context, long id)与SqlNote(Context context, long id)的实现方式基本相同 - } else { - Log.w(TAG, "loadFromCursor: cursor = null"); - } - } finally { - if (c != null) - c.close(); - } - } - - /* - * 功能描述:通过游标从光标处加载数据 - * Made By CuiCan - */ - private void loadFromCursor(Cursor c) { - //直接从一条记录中的获得以下变量的初始值 - mId = c.getLong(ID_COLUMN); - mAlertDate = c.getLong(ALERTED_DATE_COLUMN); - mBgColorId = c.getInt(BG_COLOR_ID_COLUMN); - mCreatedDate = c.getLong(CREATED_DATE_COLUMN); - mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN); - mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN); - mParentId = c.getLong(PARENT_ID_COLUMN); - mSnippet = c.getString(SNIPPET_COLUMN); - mType = c.getInt(TYPE_COLUMN); - mWidgetId = c.getInt(WIDGET_ID_COLUMN); - mWidgetType = c.getInt(WIDGET_TYPE_COLUMN); - mVersion = c.getLong(VERSION_COLUMN); - } - - /* - * 功能描述:通过content机制获取共享数据并加载到数据库当前游标处 - * 参数注解: - * Made By CuiCan - */ - private void loadDataContent() { - Cursor c = null; - mDataList.clear(); - try { - c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA, - "(note_id=?)", new String[] { - String.valueOf(mId) - }, null); - if (c != null) { - if (c.getCount() == 0) { - Log.w(TAG, "it seems that the note has not data"); - return; - } - while (c.moveToNext()) { - SqlData data = new SqlData(mContext, c); - mDataList.add(data); - } - } else { - Log.w(TAG, "loadDataContent: cursor = null"); - } - } finally { - if (c != null) - c.close(); - } - } - - /* - * 功能描述:设置通过content机制用于共享的数据信息 - * 参数注解: - * Made By CuiCan - */ - public boolean setContent(JSONObject js) { - try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { - Log.w(TAG, "cannot set system folder"); - } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { - // for folder we can only update the snnipet and type - String snippet = note.has(NoteColumns.SNIPPET) ? note - .getString(NoteColumns.SNIPPET) : ""; - if (mIsCreate || !mSnippet.equals(snippet)) { - mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); - } - mSnippet = snippet; - - int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) - : Notes.TYPE_NOTE; - if (mIsCreate || mType != type) { - mDiffNoteValues.put(NoteColumns.TYPE, type); - } - mType = type; - } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) { - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID; - if (mIsCreate || mId != id) { - mDiffNoteValues.put(NoteColumns.ID, id); - } - mId = id; - - long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note - .getLong(NoteColumns.ALERTED_DATE) : 0; - if (mIsCreate || mAlertDate != alertDate) { - mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate); - } - mAlertDate = alertDate; - - int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note - .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext); - if (mIsCreate || mBgColorId != bgColorId) { - mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId); - } - mBgColorId = bgColorId; - long createDate = note.has(NoteColumns.CREATED_DATE) ? note - .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis(); - if (mIsCreate || mCreatedDate != createDate) { - mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate); - } - mCreatedDate = createDate; - - int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note - .getInt(NoteColumns.HAS_ATTACHMENT) : 0; - if (mIsCreate || mHasAttachment != hasAttachment) { - mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment); - } - mHasAttachment = hasAttachment; - - long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note - .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis(); - if (mIsCreate || mModifiedDate != modifiedDate) { - mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate); - } - mModifiedDate = modifiedDate; - - long parentId = note.has(NoteColumns.PARENT_ID) ? note - .getLong(NoteColumns.PARENT_ID) : 0; - if (mIsCreate || mParentId != parentId) { - mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId); - } - mParentId = parentId; - - String snippet = note.has(NoteColumns.SNIPPET) ? note - .getString(NoteColumns.SNIPPET) : ""; - if (mIsCreate || !mSnippet.equals(snippet)) { - mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); - } - mSnippet = snippet; - - int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) - : Notes.TYPE_NOTE; - if (mIsCreate || mType != type) { - mDiffNoteValues.put(NoteColumns.TYPE, type); - } - mType = type; - - int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID) - : AppWidgetManager.INVALID_APPWIDGET_ID; - if (mIsCreate || mWidgetId != widgetId) { - mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId); - } - mWidgetId = widgetId; - - int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note - .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE; - if (mIsCreate || mWidgetType != widgetType) { - mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType); - } - mWidgetType = widgetType; - - long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note - .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0; - if (mIsCreate || mOriginParent != originParent) { - mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent); - } - mOriginParent = originParent; - - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - SqlData sqlData = null; - if (data.has(DataColumns.ID)) { - long dataId = data.getLong(DataColumns.ID); - for (SqlData temp : mDataList) { - if (dataId == temp.getId()) { - sqlData = temp; - } - } - } - - if (sqlData == null) { - sqlData = new SqlData(mContext); - mDataList.add(sqlData); - } - - sqlData.setContent(data); - } - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return false; - } - return true; - } - - /* - * 功能描述:获取content机制提供的数据并加载到note中 - * 参数注解: - * Made By CuiCan - */ - public JSONObject getContent() { - try { - JSONObject js = new JSONObject(); - - if (mIsCreate) { - Log.e(TAG, "it seems that we haven't created this in database yet"); - return null; - } - - JSONObject note = new JSONObject(); - if (mType == Notes.TYPE_NOTE) {//类型为note时 - note.put(NoteColumns.ID, mId); - note.put(NoteColumns.ALERTED_DATE, mAlertDate); - note.put(NoteColumns.BG_COLOR_ID, mBgColorId); - note.put(NoteColumns.CREATED_DATE, mCreatedDate); - note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment); - note.put(NoteColumns.MODIFIED_DATE, mModifiedDate); - note.put(NoteColumns.PARENT_ID, mParentId); - note.put(NoteColumns.SNIPPET, mSnippet); - note.put(NoteColumns.TYPE, mType); - note.put(NoteColumns.WIDGET_ID, mWidgetId); - note.put(NoteColumns.WIDGET_TYPE, mWidgetType); - note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - - JSONArray dataArray = new JSONArray(); - for (SqlData sqlData : mDataList) { - JSONObject data = sqlData.getContent(); - if (data != null) { - dataArray.put(data); - } - } - js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); - } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {//类型为文件夹或者 - note.put(NoteColumns.ID, mId); - note.put(NoteColumns.TYPE, mType); - note.put(NoteColumns.SNIPPET, mSnippet); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - } - - return js; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - return null; - } - - /* - * 功能描述:给当前id设置父id - * 参数注解: - * Made By CuiCan - */ - public void setParentId(long id) { - mParentId = id; - mDiffNoteValues.put(NoteColumns.PARENT_ID, id); - } - - /* - * 功能描述:给当前id设置Gtaskid - * 参数注解: - * Made By CuiCan - */ - public void setGtaskId(String gid) { - mDiffNoteValues.put(NoteColumns.GTASK_ID, gid); - } - - /* - * 功能描述:给当前id设置同步id - * 参数注解: - * Made By CuiCan - */ - public void setSyncId(long syncId) { - mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId); - } - - /* - * 功能描述:初始化本地修改,即撤销所有当前修改 - * 参数注解: - * Made By CuiCan - */ - public void resetLocalModified() { - mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0); - } - - /* - * 功能描述:获得当前id - * 参数注解: - * Made By CuiCan - */ - public long getId() { - return mId; - } - - /* - * 功能描述:获得当前id的父id - * 参数注解: - * Made By CuiCan - */ - public long getParentId() { - return mParentId; - } - - /* - * 功能描述:获取小片段即用于显示的部分便签内容 - * 参数注解: - * Made By CuiCan - */ - public String getSnippet() { - return mSnippet; - } - - /* - * 功能描述:判断是否为便签类型 - * 参数注解: - * Made By CuiCan - */ - public boolean isNoteType() { - return mType == Notes.TYPE_NOTE; - } - - /* - * 功能描述:commit函数用于把当前造作所做的修改保存到数据库 - * 参数注解: - * Made By CuiCan - */ - public void commit(boolean validateVersion) { - if (mIsCreate) { - if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) { - mDiffNoteValues.remove(NoteColumns.ID); - } - - Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues); - try { - mId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { - Log.e(TAG, "Get note id error :" + e.toString()); - throw new ActionFailureException("create note failed"); - } - if (mId == 0) { - throw new IllegalStateException("Create thread id failed"); - } - - if (mType == Notes.TYPE_NOTE) { - for (SqlData sqlData : mDataList) {//直接使用sqldata中的实现 - sqlData.commit(mId, false, -1); - } - } - } else { - if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) { - Log.e(TAG, "No such note"); - throw new IllegalStateException("Try to update note with invalid id"); - } - if (mDiffNoteValues.size() > 0) { - mVersion ++; - int result = 0; - if (!validateVersion) {//构造字符串 - result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" - + NoteColumns.ID + "=?)", new String[] { - String.valueOf(mId) - }); - } else { - result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" - + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)", - new String[] { - String.valueOf(mId), String.valueOf(mVersion) - }); - } - if (result == 0) { - Log.w(TAG, "there is no update. maybe user updates note when syncing"); - } - } - - if (mType == Notes.TYPE_NOTE) { - for (SqlData sqlData : mDataList) { - sqlData.commit(mId, validateVersion, mVersion); - } - } - } - - // refresh local info - loadFromCursor(mId); - if (mType == Notes.TYPE_NOTE) - loadDataContent(); - - mDiffNoteValues.clear(); - mIsCreate = false; - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Task.java deleted file mode 100644 index ff4b8c5..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Task.java +++ /dev/null @@ -1,354 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.data; - -import android.database.Cursor; -import android.text.TextUtils; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.DataConstants; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.tool.GTaskStringUtils; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -public class Task extends Node { - private static final String TAG = Task.class.getSimpleName(); - - private boolean mCompleted;//是否完成 - - private String mNotes; - - private JSONObject mMetaInfo;//将在实例中存储数据的类型 - - private Task mPriorSibling;//对应的优先兄弟Task的指针(待完善) - - private TaskList mParent;//所在的任务列表的指针 - - public Task() { - super(); - mCompleted = false; - mNotes = null; - mPriorSibling = null;//TaskList中当前Task前面的Task的指针 - mParent = null;//当前Task所在的TaskList - mMetaInfo = null; - } - - public JSONObject getCreateAction(int actionId) { - JSONObject js = new JSONObject(); - - try { - // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); - - // action_id - js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); - - // index - js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this)); - - // entity_delta - JSONObject entity = new JSONObject(); - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); - entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, - GTaskStringUtils.GTASK_JSON_TYPE_TASK); - if (getNotes() != null) { - entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); - } - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); - - // parent_id - if (mParent!= null) { - js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid()); - } - - // dest_parent_type - js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE, - GTaskStringUtils.GTASK_JSON_TYPE_GROUP); - - // list_id - if (mParent!= null) { - js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid()); - } - - // prior_sibling_id - if (mPriorSibling != null) { - js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid()); - } - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to generate task-create jsonobject"); - } - - return js; - } - - public JSONObject getUpdateAction(int actionId) { - JSONObject js = new JSONObject(); - - try { - // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); - - // action_id - js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); - - // id - js.put(GTaskStringUtils.GTASK_JSON_ID, getGid()); - - // entity_delta - JSONObject entity = new JSONObject(); - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - if (getNotes() != null) { - entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); - } - entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to generate task-update jsonobject"); - } - - return js; - } - - public void setContentByRemoteJSON(JSONObject js) { - if (js != null) { - try { - // id - if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { - setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); - } - - // last_modified - if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { - setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); - } - - // name - if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) { - setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); - } - - // notes - if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) { - setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES)); - } - - // deleted - if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) { - setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED)); - } - - // completed - if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) { - setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED)); - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to get task content from jsonobject"); - } - } - } - - public void setContentByLocalJSON(JSONObject js) { //��metadata����ʵʩ - if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE) - || !js.has(GTaskStringUtils.META_HEAD_DATA)) { - Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); - } - - try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - - if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { - Log.e(TAG, "invalid type"); - return; - } - - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { - setName(data.getString(DataColumns.CONTENT)); - break; - } - } - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - } - - public JSONObject getLocalJSONFromContent() { - String name = getName(); - try { - if (mMetaInfo == null) { - // new task created from web - if (name == null) { - Log.w(TAG, "the note seems to be an empty one"); - return null; - } - - JSONObject js = new JSONObject(); - JSONObject note = new JSONObject(); - JSONArray dataArray = new JSONArray(); - JSONObject data = new JSONObject(); - data.put(DataColumns.CONTENT, name); - dataArray.put(data); - js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); - note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - return js; - } else { - // synced task - JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { - data.put(DataColumns.CONTENT, getName()); - break; - } - } - - note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - return mMetaInfo; - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return null; - } - } - - public void setMetaInfo(MetaData metaData) { - if (metaData != null && metaData.getNotes() != null) { - try { - mMetaInfo = new JSONObject(metaData.getNotes()); - } catch (JSONException e) { - Log.w(TAG, e.toString()); - mMetaInfo = null; - } - } - } - - public int getSyncAction(Cursor c) { - try { - JSONObject noteInfo = null; - if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) { - noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - } - - if (noteInfo == null) { - Log.w(TAG, "it seems that note meta has been deleted"); - return SYNC_ACTION_UPDATE_REMOTE; - } - - if (!noteInfo.has(NoteColumns.ID)) { - Log.w(TAG, "remote note id seems to be deleted"); - return SYNC_ACTION_UPDATE_LOCAL; - } - - // validate the note id now - if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) { - Log.w(TAG, "note id doesn't match"); - return SYNC_ACTION_UPDATE_LOCAL; - } - - if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { - // there is no local update - if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // no update both side - return SYNC_ACTION_NONE; - } else { - // apply remote to local - return SYNC_ACTION_UPDATE_LOCAL; - } - } else { - // validate gtask id - if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { - Log.e(TAG, "gtask id doesn't match"); - return SYNC_ACTION_ERROR; - } - if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // local modification only - return SYNC_ACTION_UPDATE_REMOTE; - } else { - return SYNC_ACTION_UPDATE_CONFLICT; - } - } - } catch (Exception e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - - return SYNC_ACTION_ERROR; - } - - public boolean isWorthSaving() { - return mMetaInfo != null || (getName() != null && getName().trim().length() > 0) - || (getNotes() != null && getNotes().trim().length() > 0); - } - - public void setCompleted(boolean completed) { - this.mCompleted = completed; - } - - public void setNotes(String notes) { - this.mNotes = notes; - } - - public void setPriorSibling(Task priorSibling) { - this.mPriorSibling = priorSibling; - } - - public void setParent(TaskList parent) { - this.mParent = parent; - } - - public boolean getCompleted() { - return this.mCompleted; - } - - public String getNotes() { - return this.mNotes; - } - - public Task getPriorSibling() { - return this.mPriorSibling; - } - - public TaskList getParent() { - return this.mParent; - } - -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/TaskList.java deleted file mode 100644 index 5a7b09a..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/TaskList.java +++ /dev/null @@ -1,399 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.data; - -import android.database.Cursor; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.tool.GTaskStringUtils; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; - -public class TaskList extends Node { - private static final String TAG = TaskList.class.getSimpleName();//tag标记 - - private int mIndex;//当前TaskList的指针 - - private ArrayList mChildren;//类中主要的保存数据的单元,用来实现一个以Task为元素的ArrayList - - public TaskList() { - super(); - mChildren = new ArrayList(); - mIndex = 1; - } - - /* (non-Javadoc) - * @see net.micode.notes.gtask.data.Node#getCreateAction(int) - * 生成并返回一个包含了一定数据的JSONObject实体 - */ - public JSONObject getCreateAction(int actionId) { - JSONObject js = new JSONObject(); - - try { - // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); - - // action_id - js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); - - // index - js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex); - - // entity_delta - JSONObject entity = new JSONObject();//entity实体 - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); - entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, - GTaskStringUtils.GTASK_JSON_TYPE_GROUP); - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to generate tasklist-create jsonobject"); - } - - return js; - } - - /* (non-Javadoc) - * @see net.micode.notes.gtask.data.Node#getUpdateAction(int) - * 生成并返回一个包含了一定数据的JSONObject实体 - */ - public JSONObject getUpdateAction(int actionId) { - JSONObject js = new JSONObject(); - - try { - // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); - - // action_id - js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); - - // id - js.put(GTaskStringUtils.GTASK_JSON_ID, getGid()); - - // entity_delta - JSONObject entity = new JSONObject(); - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to generate tasklist-update jsonobject"); - } - - return js; - } - - public void setContentByRemoteJSON(JSONObject js) { - if (js != null) { - try { - // id - if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { - setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); - } - - // last_modified - if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { - setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); - } - - // name - if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) { - setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); - } - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to get tasklist content from jsonobject"); - } - } - } - - public void setContentByLocalJSON(JSONObject js) { - if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) { - Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); - } - - try { - JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - - if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { - String name = folder.getString(NoteColumns.SNIPPET); - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); - } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { - if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); - else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_CALL_NOTE); - else - Log.e(TAG, "invalid system folder"); - } else { - Log.e(TAG, "error type"); - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - } - - public JSONObject getLocalJSONFromContent() { - try { - JSONObject js = new JSONObject(); - JSONObject folder = new JSONObject(); - - String folderName = getName(); - if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)) - folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(), - folderName.length()); - folder.put(NoteColumns.SNIPPET, folderName); - if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT) - || folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE)) - folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - else - folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); - - js.put(GTaskStringUtils.META_HEAD_NOTE, folder); - - return js; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return null; - } - } - - public int getSyncAction(Cursor c) { - try { - if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { - // there is no local update - if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // no update both side - return SYNC_ACTION_NONE; - } else { - // apply remote to local - return SYNC_ACTION_UPDATE_LOCAL; - } - } else { - // validate gtask id - if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { - Log.e(TAG, "gtask id doesn't match"); - return SYNC_ACTION_ERROR; - } - if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // local modification only - return SYNC_ACTION_UPDATE_REMOTE; - } else { - // for folder conflicts, just apply local modification - return SYNC_ACTION_UPDATE_REMOTE; - } - } - } catch (Exception e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - - return SYNC_ACTION_ERROR; - } - - /** - * @return - * 功能:获得TaskList的大小,即mChildren的大小 - */ - public int getChildTaskCount() { - return mChildren.size(); - } - - /** - * @param task - * @return 返回值为是否成功添加任务。 - * 功能:在当前任务表末尾添加新的任务。 - */ - public boolean addChildTask(Task task) { - boolean ret = false; - if (task != null && !mChildren.contains(task)) { - ret = mChildren.add(task); - if (ret) { - // need to set prior sibling and parent - task.setPriorSibling(mChildren.isEmpty() ? null : mChildren - .get(mChildren.size() - 1)); - task.setParent(this); - //注意:每一次ArrayList的变化都要紧跟相关Task中PriorSibling的更改 - //,接下来几个函数都有相关操作 - } - } - return ret; - } - - /** - * @param task - * @param index - * @return - * 功能:在当前任务表的指定位置添加新的任务。 - */ - public boolean addChildTask(Task task, int index) { - if (index < 0 || index > mChildren.size()) { - Log.e(TAG, "add child task: invalid index"); - return false; - } - - int pos = mChildren.indexOf(task); - if (task != null && pos == -1) { - mChildren.add(index, task); - - // update the task list - Task preTask = null; - Task afterTask = null; - if (index != 0) - preTask = mChildren.get(index - 1); - if (index != mChildren.size() - 1) - afterTask = mChildren.get(index + 1); - - task.setPriorSibling(preTask); - if (afterTask != null) - afterTask.setPriorSibling(task); - } - - return true; - } - - /** - * @param task - * @return 返回删除是否成功 - * 功能:删除TaskList中的一个Task - */ - public boolean removeChildTask(Task task) { - boolean ret = false; - int index = mChildren.indexOf(task); - if (index != -1) { - ret = mChildren.remove(task); - - if (ret) { - // reset prior sibling and parent - task.setPriorSibling(null); - task.setParent(null); - - // update the task list - if (index != mChildren.size()) { - mChildren.get(index).setPriorSibling( - index == 0 ? null : mChildren.get(index - 1)); - } - } - } - return ret; - } - - /** - * @param task - * @param index - * @return - * 功能:将当前TaskList中含有的某个Task移到index位置 - */ - public boolean moveChildTask(Task task, int index) { - - if (index < 0 || index >= mChildren.size()) { - Log.e(TAG, "move child task: invalid index"); - return false; - } - - int pos = mChildren.indexOf(task); - if (pos == -1) { - Log.e(TAG, "move child task: the task should in the list"); - return false; - } - - if (pos == index) - return true; - return (removeChildTask(task) && addChildTask(task, index)); - //利用已实现好的功能完成当下功能; - } - - /** - * @param gid - * @return返回寻找结果 - * 功能:按gid寻找Task - */ - public Task findChildTaskByGid(String gid) { - for (int i = 0; i < mChildren.size(); i++) { - Task t = mChildren.get(i); - if (t.getGid().equals(gid)) { - return t; - } - } - return null; - } - - /** - * @param task - * @return - * 功能:返回指定Task的index - */ - public int getChildTaskIndex(Task task) { - return mChildren.indexOf(task); - } - - /** - * @param index - * @return - * 功能:返回指定index的Task - */ - public Task getChildTaskByIndex(int index) { - if (index < 0 || index >= mChildren.size()) { - Log.e(TAG, "getTaskByIndex: invalid index"); - return null; - } - return mChildren.get(index); - } - - /** - * @param gid - * @return - * 功能:返回指定gid的Task - */ - public Task getChilTaskByGid(String gid) { - for (Task task : mChildren) {//一种常见的ArrayList的遍历方法(四种,见精读笔记) - if (task.getGid().equals(gid)) - return task; - } - return null; - } - - public ArrayList getChildTaskList() { - return this.mChildren; - } - - public void setIndex(int index) { - this.mIndex = index; - } - - public int getIndex() { - return this.mIndex; - } -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java deleted file mode 100644 index 59bb859..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.exception; - -public class ActionFailureException extends RuntimeException { - private static final long serialVersionUID = 4425249765923293627L; - - public ActionFailureException() { - super(); - } - /* - * 在JAVA类中使用super来引用父类的成分,用this来引用当前对象. - * 如果一个类从另外一个类继承,我们new这个子类的实例对象的时候,这个子类对象里面会有一个父类对象。 - * 怎么去引用里面的父类对象呢?使用super来引用 - * 也就是说,此处super()以及super (paramString)可认为是Exception ()和Exception (paramString) - - */ - - public ActionFailureException(String paramString) { - super(paramString); - } - - public ActionFailureException(String paramString, Throwable paramThrowable) { - super(paramString, paramThrowable); - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java deleted file mode 100644 index 2111ae9..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.exception; -/* - * Description:支持小米便签运行过程中的网络异常处理。 - */ - -public class NetworkFailureException extends Exception { - private static final long serialVersionUID = 2107610287180234136L; - - public NetworkFailureException() { - super(); - } - /* - * 在JAVA类中使用super来引用父类的成分,用this来引用当前对象. - * 如果一个类从另外一个类继承,我们new这个子类的实例对象的时候,这个子类对象里面会有一个父类对象。 - * 怎么去引用里面的父类对象呢?使用super来引用 - * 也就是说,此处super()以及super (paramString)可认为是Exception ()和Exception (paramString) - */ - public NetworkFailureException(String paramString) { - super(paramString); - } - - public NetworkFailureException(String paramString, Throwable paramThrowable) { - super(paramString, paramThrowable); - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java deleted file mode 100644 index 6b93f27..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ /dev/null @@ -1,142 +0,0 @@ - -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.remote; - -import android.app.Notification; -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.os.AsyncTask; - -import net.micode.notes.R; -import net.micode.notes.ui.NotesListActivity; -import net.micode.notes.ui.NotesPreferenceActivity; - -/*异步操作类,实现GTask的异步操作过程 - * 主要方法: - * private void showNotification(int tickerId, String content) 向用户提示当前同步的状态,是一个用于交互的方法 - * protected Integer doInBackground(Void... unused) 此方法在后台线程执行,完成任务的主要工作,通常需要较长的时间 - * protected void onProgressUpdate(String... progress) 可以使用进度条增加用户体验度。 此方法在主线程执行,用于显示任务执行的进度。 - * protected void onPostExecute(Integer result) 相当于Handler 处理UI的方式,在这里面可以使用在doInBackground 得到的结果处理操作UI - */ - -public class GTaskASyncTask extends AsyncTask { - - private static int GTASK_SYNC_NOTIFICATION_ID = 5234235; - - public interface OnCompleteListener { - void onComplete(); - } - - private Context mContext; - - private NotificationManager mNotifiManager; - - private GTaskManager mTaskManager; - - private OnCompleteListener mOnCompleteListener; - - public GTaskASyncTask(Context context, OnCompleteListener listener) { - mContext = context; - mOnCompleteListener = listener; - mNotifiManager = (NotificationManager) mContext - .getSystemService(Context.NOTIFICATION_SERVICE); - mTaskManager = GTaskManager.getInstance(); - } - - public void cancelSync() { - mTaskManager.cancelSync(); - } - - public void publishProgess(String message) {// 发布进度单位,系统将会调用onProgressUpdate()方法更新这些值 - publishProgress(new String[] { - message - }); - } - - private void showNotification(int tickerId, String content) { - Notification notification = new Notification(R.drawable.notification, mContext - .getString(tickerId), System.currentTimeMillis()); - notification.defaults = Notification.DEFAULT_LIGHTS; - notification.flags = Notification.FLAG_AUTO_CANCEL; - PendingIntent pendingIntent;//一个描述了想要启动一个Activity、Broadcast或是Service的意图 - if (tickerId != R.string.ticker_success) { - pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesPreferenceActivity.class), 0); - - } else { - pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesListActivity.class), 0); - } - // notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, - // pendingIntent); - notification = new Notification.Builder(mContext) - .setContentIntent(pendingIntent) - .setTicker(mContext.getString(R.string.app_name)) - .setContentTitle(mContext.getString(R.string.app_name)) - .setContentText(content) - .setWhen(System.currentTimeMillis()) - .setSmallIcon(R.drawable.icon_app) - .build(); - notification.icon = R.drawable.icon_app; - mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); - mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); - } - - @Override - protected Integer doInBackground(Void... unused) { - publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity - .getSyncAccountName(mContext))); - return mTaskManager.sync(mContext, this); - } - - @Override - protected void onProgressUpdate(String... progress) { - showNotification(R.string.ticker_syncing, progress[0]); - if (mContext instanceof GTaskSyncService) { //instanceof 判断mContext是否是GTaskSyncService的实例 - ((GTaskSyncService) mContext).sendBroadcast(progress[0]); - } - } - - @Override - protected void onPostExecute(Integer result) { //用于在执行完后台任务后更新UI,显示结果 - if (result == GTaskManager.STATE_SUCCESS) { - showNotification(R.string.ticker_success, mContext.getString( - R.string.success_sync_account, mTaskManager.getSyncAccount())); - NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis()); //设置最新同步的时间 - } else if (result == GTaskManager.STATE_NETWORK_ERROR) { - showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network)); - } else if (result == GTaskManager.STATE_INTERNAL_ERROR) { - showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal)); - } else if (result == GTaskManager.STATE_SYNC_CANCELLED) { - showNotification(R.string.ticker_cancel, mContext - .getString(R.string.error_sync_cancelled)); - } //几种不同情况下的结果显示 - if (mOnCompleteListener != null) { - new Thread(new Runnable() { //这里好像是方法内的一个线程,但是并不太懂什么意思 - - public void run() { //完成后的操作,使用onComplete()将所有值都重新初始化,相当于完成一次操作 - mOnCompleteListener.onComplete(); - } - }).start(); - } - } -} - - diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java deleted file mode 100644 index 95a4cf6..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java +++ /dev/null @@ -1,674 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.remote; - -import android.accounts.Account; -import android.accounts.AccountManager; -import android.accounts.AccountManagerFuture; -import android.app.Activity; -import android.os.Bundle; -import android.text.TextUtils; -import android.util.Log; - -import net.micode.notes.gtask.data.Node; -import net.micode.notes.gtask.data.Task; -import net.micode.notes.gtask.data.TaskList; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.gtask.exception.NetworkFailureException; -import net.micode.notes.tool.GTaskStringUtils; -import net.micode.notes.ui.NotesPreferenceActivity; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.cookie.Cookie; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.params.HttpParams; -import org.apache.http.params.HttpProtocolParams; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.LinkedList; -import java.util.List; -import java.util.zip.GZIPInputStream; -import java.util.zip.Inflater; -import java.util.zip.InflaterInputStream; - - - -/* - * 主要功能:实现GTASK的登录操作,进行GTASK任务的创建,创建任务列表,从网络上获取任务和任务列表的内容 - * 主要使用类或技术:accountManager JSONObject HttpParams authToken Gid - */ -public class GTaskClient { - private static final String TAG = GTaskClient.class.getSimpleName(); - - private static final String GTASK_URL = "https://mail.google.com/tasks/"; //这个是指定的URL - - private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig"; - - private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig"; - - private static GTaskClient mInstance = null; - - private DefaultHttpClient mHttpClient; - - private String mGetUrl; - - private String mPostUrl; - - private long mClientVersion; - - private boolean mLoggedin; - - private long mLastLoginTime; - - private int mActionId; - - private Account mAccount; - - private JSONArray mUpdateArray; - - private GTaskClient() { - mHttpClient = null; - mGetUrl = GTASK_GET_URL; - mPostUrl = GTASK_POST_URL; - mClientVersion = -1; - mLoggedin = false; - mLastLoginTime = 0; - mActionId = 1; - mAccount = null; - mUpdateArray = null; - } - - /*用来获取的实例化对象 - * 使用 getInstance() - * 返回mInstance这个实例化对象 - */ - public static synchronized GTaskClient getInstance() { - if (mInstance == null) { - mInstance = new GTaskClient(); - } - return mInstance; - } - - /*用来实现登录操作的函数,传入的参数是一个Activity - * 设置登录操作限制时间,如果超时则需要重新登录 - * 有两种登录方式,使用用户自己的URL登录或者使用谷歌官方的URL登录 - * 返回true或者false,即最后是否登陆成功 - */ - public boolean login(Activity activity) { - // we suppose that the cookie would expire after 5 minutes - // then we need to re-login - //判断距离最后一次登录操作是否超过5分钟 - final long interval = 1000 * 60 * 5; - if (mLastLoginTime + interval < System.currentTimeMillis()) { - mLoggedin = false; - } - - // need to re-login after account switch 重新登录操作 - if (mLoggedin - && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity - .getSyncAccountName(activity))) { - mLoggedin = false; - } - - //如果没超过时间,则不需要重新登录 - if (mLoggedin) { - Log.d(TAG, "already logged in"); - return true; - } - - mLastLoginTime = System.currentTimeMillis();//更新最后登录时间,改为系统当前的时间 - String authToken = loginGoogleAccount(activity, false);//判断是否登录到谷歌账户 - if (authToken == null) { - Log.e(TAG, "login google account failed"); - return false; - } - - // login with custom domain if necessary - //尝试使用用户自己的域名登录 - if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase() //将用户账号名改为统一格式(小写)后判断是否为一个谷歌账号地址 - .endsWith("googlemail.com"))) { - StringBuilder url = new StringBuilder(GTASK_URL).append("a/"); - int index = mAccount.name.indexOf('@') + 1; - String suffix = mAccount.name.substring(index); - url.append(suffix + "/"); - mGetUrl = url.toString() + "ig"; //设置用户对应的getUrl - mPostUrl = url.toString() + "r/ig"; //设置用户对应的postUrl - - if (tryToLoginGtask(activity, authToken)) { - mLoggedin = true; - } - } - - // try to login with google official url - //如果用户账户无法登录,则使用谷歌官方的URI进行登录 - if (!mLoggedin) { - mGetUrl = GTASK_GET_URL; - mPostUrl = GTASK_POST_URL; - if (!tryToLoginGtask(activity, authToken)) { - return false; - } - } - - mLoggedin = true; - return true; - } - - /*具体实现登录谷歌账户的方法 - * 使用令牌机制 - * 使用AccountManager来管理注册账号 - * 返回值是账号的令牌 - */ - private String loginGoogleAccount(Activity activity, boolean invalidateToken) { - String authToken; //令牌,是登录操作保证安全性的一个方法 - AccountManager accountManager = AccountManager.get(activity);//AccountManager这个类给用户提供了集中注册账号的接口 - Account[] accounts = accountManager.getAccountsByType("com.google");//获取全部以com.google结尾的account - - if (accounts.length == 0) { - Log.e(TAG, "there is no available google account"); - return null; - } - - String accountName = NotesPreferenceActivity.getSyncAccountName(activity); - Account account = null; - //遍历获得的accounts信息,寻找已经记录过的账户信息 - for (Account a : accounts) { - if (a.name.equals(accountName)) { - account = a; - break; - } - } - if (account != null) { - mAccount = account; - } else { - Log.e(TAG, "unable to get an account with the same name in the settings"); - return null; - } - - // get the token now - //获取选中账号的令牌 - AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account, - "goanna_mobile", null, activity, null, null); - try { - Bundle authTokenBundle = accountManagerFuture.getResult(); - authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN); - //如果是invalidateToken,那么需要调用invalidateAuthToken(String, String)方法废除这个无效token - if (invalidateToken) { - accountManager.invalidateAuthToken("com.google", authToken); - loginGoogleAccount(activity, false); - } - } catch (Exception e) { - Log.e(TAG, "get auth token failed"); - authToken = null; - } - - return authToken; - } - - //尝试登陆Gtask,这只是一个预先判断令牌是否是有效以及是否能登上GTask的方法,而不是具体实现登陆的方法 - private boolean tryToLoginGtask(Activity activity, String authToken) { - if (!loginGtask(authToken)) { - // maybe the auth token is out of authTokedate, now let's invalidate the - // token and try again - //删除过一个无效的authToken,申请一个新的后再次尝试登陆 - authToken = loginGoogleAccount(activity, true); - if (authToken == null) { - Log.e(TAG, "login google account failed"); - return false; - } - - if (!loginGtask(authToken)) { - Log.e(TAG, "login gtask failed"); - return false; - } - } - return true; - } - - //实现登录GTask的具体操作 - private boolean loginGtask(String authToken) { - int timeoutConnection = 10000; - int timeoutSocket = 15000; //socket是一种通信连接实现数据的交换的端口 - HttpParams httpParameters = new BasicHttpParams(); //实例化一个新的HTTP参数类 - HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);//设置连接超时时间 - HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);//设置设置端口超时时间 - mHttpClient = new DefaultHttpClient(httpParameters); - BasicCookieStore localBasicCookieStore = new BasicCookieStore(); //设置本地cookie - mHttpClient.setCookieStore(localBasicCookieStore); - HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false); - - // login gtask - try { - String loginUrl = mGetUrl + "?auth=" + authToken; //设置登录的url - HttpGet httpGet = new HttpGet(loginUrl); //通过登录的uri实例化网页上资源的查找 - HttpResponse response = null; - response = mHttpClient.execute(httpGet); - - // get the cookie now - //获取CookieStore里存放的cookie,看如果存有“GTL(不知道什么意思)”,则说明有验证成功的有效的cookie - List cookies = mHttpClient.getCookieStore().getCookies(); - boolean hasAuthCookie = false; - for (Cookie cookie : cookies) { - if (cookie.getName().contains("GTL")) { - hasAuthCookie = true; - } - } - if (!hasAuthCookie) { - Log.w(TAG, "it seems that there is no auth cookie"); - } - - // get the client version - //获取client的内容,具体操作是在返回的Content中截取从_setup(开始到)}中间的字符串内容,也就是gtask_url的内容 - String resString = getResponseContent(response.getEntity()); - String jsBegin = "_setup("; - String jsEnd = ")}"; - int begin = resString.indexOf(jsBegin); - int end = resString.lastIndexOf(jsEnd); - String jsString = null; - if (begin != -1 && end != -1 && begin < end) { - jsString = resString.substring(begin + jsBegin.length(), end); - } - JSONObject js = new JSONObject(jsString); - mClientVersion = js.getLong("v"); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return false; - } catch (Exception e) { - // simply catch all exceptions - Log.e(TAG, "httpget gtask_url failed"); - return false; - } - - return true; - } - - private int getActionId() { - return mActionId++; - } - - /*实例化创建一个用于向网络传输数据的对象 - * 使用HttpPost类 - * 返回一个httpPost实例化对象,但里面还没有内容 - */ - private HttpPost createHttpPost() { - HttpPost httpPost = new HttpPost(mPostUrl); - httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); - httpPost.setHeader("AT", "1"); - return httpPost; - } - - /*通过URL获取响应后返回的数据,也就是网络上的数据和资源 - * 使用getContentEncoding()获取网络上的资源和数据 - * 返回值就是获取到的资源 - */ - private String getResponseContent(HttpEntity entity) throws IOException { - String contentEncoding = null; - if (entity.getContentEncoding() != null) {//通过URL得到HttpEntity对象,如果不为空则使用getContent()方法创建一个流将数据从网络都过来 - contentEncoding = entity.getContentEncoding().getValue(); - Log.d(TAG, "encoding: " + contentEncoding); - } - - InputStream input = entity.getContent(); - if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {//GZIP是使用DEFLATE进行压缩数据的另一个压缩库 - input = new GZIPInputStream(entity.getContent()); - } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {//DEFLATE是一个无专利的压缩算法,它可以实现无损数据压缩 - Inflater inflater = new Inflater(true); - input = new InflaterInputStream(entity.getContent(), inflater); - } - - try { - InputStreamReader isr = new InputStreamReader(input); - BufferedReader br = new BufferedReader(isr);//是一个包装类,它可以包装字符流,将字符流放入缓存里,先把字符读到缓存里,到缓存满了时候,再读入内存,是为了提供读的效率而设计的 - StringBuilder sb = new StringBuilder(); - - while (true) { - String buff = br.readLine(); - if (buff == null) { - return sb.toString(); - } - sb = sb.append(buff); - } - } finally { - input.close(); - } - } - - /*通过JSON发送请求 - * 请求的具体内容在json的实例化对象js中然后传入 - * 利用UrlEncodedFormEntity entity和httpPost.setEntity(entity)方法把js中的内容放置到httpPost中 - * 执行请求后使用getResponseContent方法得到返回的数据和资源 - * 将资源再次放入json后返回 - */ - private JSONObject postRequest(JSONObject js) throws NetworkFailureException { - if (!mLoggedin) {//未登录 - Log.e(TAG, "please login first"); - throw new ActionFailureException("not logged in"); - } - - //实例化一个httpPost的对象用来向服务器传输数据,在这里就是发送请求,而请求的内容在js里 - HttpPost httpPost = createHttpPost(); - try { - LinkedList list = new LinkedList(); - list.add(new BasicNameValuePair("r", js.toString())); - UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8"); //UrlEncodedFormEntity()的形式比较单一,是普通的键值对 - httpPost.setEntity(entity); - - // execute the post - //执行这个请求 - HttpResponse response = mHttpClient.execute(httpPost); - String jsString = getResponseContent(response.getEntity()); - return new JSONObject(jsString); - - } catch (ClientProtocolException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("postRequest failed"); - } catch (IOException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("postRequest failed"); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("unable to convert response content to jsonobject"); - } catch (Exception e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("error occurs when posting request"); - } - } - - /*创建单个任务 - * 传入参数是一个.gtask.data.Task包里Task类的对象 - * 利用json获取Task里的内容,并且创建相应的jsPost - * 利用postRequest得到任务的返回信息 - * 使用task.setGid设置task的new_ID - */ - public void createTask(Task task) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - - // action_list - actionList.put(task.getCreateAction(getActionId())); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - // post - JSONObject jsResponse = postRequest(jsPost); - JSONObject jsResult = (JSONObject) jsResponse.getJSONArray( - GTaskStringUtils.GTASK_JSON_RESULTS).get(0); - task.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID)); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("create task: handing jsonobject failed"); - } - } - - /* - * 创建一个任务列表,与createTask几乎一样,区别就是最后设置的是tasklist的gid - */ - public void createTaskList(TaskList tasklist) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - - // action_list - actionList.put(tasklist.getCreateAction(getActionId())); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - // post - JSONObject jsResponse = postRequest(jsPost); - JSONObject jsResult = (JSONObject) jsResponse.getJSONArray( - GTaskStringUtils.GTASK_JSON_RESULTS).get(0); - tasklist.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID)); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("create tasklist: handing jsonobject failed"); - } - } - - /* - * 同步更新操作 - * 使用JSONObject进行数据存储,使用jsPost.put,Put的信息包括UpdateArray和ClientVersion - * 使用postRequest发送这个jspost,进行处理 - */ - public void commitUpdate() throws NetworkFailureException { - if (mUpdateArray != null) { - try { - JSONObject jsPost = new JSONObject(); - - // action_list - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, mUpdateArray); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - postRequest(jsPost); - mUpdateArray = null; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("commit update: handing jsonobject failed"); - } - } - } - - /* - * 添加更新的事项 - * 调用commitUpdate()实现 - */ - public void addUpdateNode(Node node) throws NetworkFailureException { - if (node != null) { - // too many update items may result in an error - // set max to 10 items - if (mUpdateArray != null && mUpdateArray.length() > 10) { - commitUpdate(); - } - - if (mUpdateArray == null) - mUpdateArray = new JSONArray(); - mUpdateArray.put(node.getUpdateAction(getActionId())); - } - } - - /* - * 移动task,比如讲task移动到不同的task列表中去 - * 通过getGid获取task所属列表的gid - * 通过JSONObject.put(String name, Object value)函数设置移动后的task的相关属性值,从而达到移动的目的 - * 最后还是通过postRequest进行更新后的发送 - */ - public void moveTask(Task task, TaskList preParent, TaskList curParent) - throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - JSONObject action = new JSONObject(); - - // action_list - action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_MOVE); - action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId()); - action.put(GTaskStringUtils.GTASK_JSON_ID, task.getGid()); - if (preParent == curParent && task.getPriorSibling() != null) { - // put prioring_sibing_id only if moving within the tasklist and - // it is not the first one - //设置优先级ID,只有当移动是发生在文件中 - action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling()); - } - action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid()); //设置移动前所属列表 - action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid()); //设置当前所属列表 - if (preParent != curParent) { - // put the dest_list only if moving between tasklists - action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid()); - } - actionList.put(action); - //最后将ACTION_LIST加入到jsPost中 - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - postRequest(jsPost); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("move task: handing jsonobject failed"); - } - } - - /* - * 删除操作节点 - * 还是利用JSON - * 删除过后使用postRequest发送删除后的结果 - */ - public void deleteNode(Node node) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - - // action_list - node.setDeleted(true); - actionList.put(node.getUpdateAction(getActionId())); //这里会获取到删除操作的ID,加入到actionLiast中 - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - postRequest(jsPost); - mUpdateArray = null; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("delete node: handing jsonobject failed"); - } - } - - /* - * 获取任务列表 - * 首先通过GetURI使用getResponseContent从网上获取数据 - * 然后筛选出"_setup("到)}的部分,并且从中获取GTASK_JSON_LISTS的内容返回 - */ - public JSONArray getTaskLists() throws NetworkFailureException { - if (!mLoggedin) { - Log.e(TAG, "please login first"); - throw new ActionFailureException("not logged in"); - } - - try { - HttpGet httpGet = new HttpGet(mGetUrl); - HttpResponse response = null; - response = mHttpClient.execute(httpGet); - - // get the task list - //筛选工作,把筛选出的字符串放入jsString - String resString = getResponseContent(response.getEntity()); - String jsBegin = "_setup("; - String jsEnd = ")}"; - int begin = resString.indexOf(jsBegin); - int end = resString.lastIndexOf(jsEnd); - String jsString = null; - if (begin != -1 && end != -1 && begin < end) { - jsString = resString.substring(begin + jsBegin.length(), end); - } - JSONObject js = new JSONObject(jsString); - //获取GTASK_JSON_LISTS - return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS); - } catch (ClientProtocolException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("gettasklists: httpget failed"); - } catch (IOException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("gettasklists: httpget failed"); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("get task lists: handing jasonobject failed"); - } - } - - /* - * 通过传入的TASKList的gid,从网络上获取相应属于这个任务列表的任务 - */ - public JSONArray getTaskList(String listGid) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - JSONObject action = new JSONObject(); - - // action_list - action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL); - action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId()); - action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid); //这里设置为传入的listGid - action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false); - actionList.put(action); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - JSONObject jsResponse = postRequest(jsPost); - return jsResponse.getJSONArray(GTaskStringUtils.GTASK_JSON_TASKS); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("get task list: handing jsonobject failed"); - } - } - - public Account getSyncAccount() { - return mAccount; - } - - //重置更新的内容 - public void resetUpdateArray() { - mUpdateArray = null; - } -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java deleted file mode 100644 index a8c1f2a..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java +++ /dev/null @@ -1,846 +0,0 @@ -package net.micode.notes.gtask.remote; - -public class GTaskManager { - private static final String TAG = GTaskManager.class.getSimpleName(); - public static final int STATE_SUCCESS = 0; - public static final int STATE_NETWORK_ERROR = 1; - public static final int STATE_INTERNAL_ERROR = 2; - public static final int STATE_SYNC_IN_PROGRESS = 3; - public static final int STATE_SYNC_CANCELLED = 4; - private static GTaskManager mInstance = null; - - private Activity mActivity; - private Context mContext; - private ContentResolver mContentResolver; - private boolean mSyncing; - private boolean mCancelled; - private HashMap mGTaskListHashMap; - private HashMap mGTaskHashMap; - private HashMap mMetaHashMap; - private TaskList mMetaList; - private HashSet mLocalDeleteIdMap; - private HashMap mGidToNid; - private HashMap mNidToGid; - - private GTaskManager() { //对象初始化函数 - mSyncing = false; //正在同步,flase代表未执行 - mCancelled = false; //全局标识,flase代表可以执行 - mGTaskListHashMap = new HashMap(); //<>代表Java的泛型,就是创建一个用类型作为参数的类。 - mGTaskHashMap = new HashMap(); - mMetaHashMap = new HashMap(); - mMetaList = null; - mLocalDeleteIdMap = new HashSet(); - mGidToNid = new HashMap(); //GoogleID to NodeID?? - mNidToGid = new HashMap(); //NodeID to GoogleID???通过hashmap散列表建立映射 - } - - /** - * 包含关键字synchronized,语言级同步,指明该函数可能运行在多线程的环境下。 - * 功能:类初始化函数 - * @author TTS - * @return GtaskManger - */ - public static synchronized GTaskManager getInstance() { //可能运行在多线程环境下,使用语言级同步--synchronized - if (mInstance == null) { - mInstance = new GTaskManager(); - } - return mInstance; - } - - /** - * 包含关键字synchronized,语言级同步,指明该函数可能运行在多线程的环境下。 - * @author TTS - * @param activity - */ - public synchronized void setActivityContext(Activity activity) { - // used for getting auth token - mActivity = activity; - } - - /** - * 核心函数 - * 功能:实现了本地同步操作和远端同步操作 - * @author TTS - * @param context-----获取上下文 - * @param asyncTask-------用于同步的异步操作类 - * @return int - */ - public int sync(Context context, GTaskASyncTask asyncTask) { //核心函数 - if (mSyncing) { - Log.d(TAG, "Sync is in progress"); //创建日志文件(调试信息),debug - return STATE_SYNC_IN_PROGRESS; - } - mContext = context; - mContentResolver = mContext.getContentResolver(); - mSyncing = true; - mCancelled = false; - mGTaskListHashMap.clear(); - mGTaskHashMap.clear(); - mMetaHashMap.clear(); - mLocalDeleteIdMap.clear(); - mGidToNid.clear(); - mNidToGid.clear(); - - try { - GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例,client--客户机 - client.resetUpdateArray(); //JSONArray类型,reset即置为NULL - - // login google task - if (!mCancelled) { - if (!client.login(mActivity)) { - throw new NetworkFailureException("login google task failed"); - } - } - - // get the task list from google - asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list)); - initGTaskList(); //获取Google上的JSONtasklist转为本地TaskList - - // do content sync work - asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing)); - syncContent(); - } catch (NetworkFailureException e) { //分为两种异常,此类异常为网络异常 - Log.e(TAG, e.toString()); //创建日志文件(调试信息),error - return STATE_NETWORK_ERROR; - } catch (ActionFailureException e) { //此类异常为操作异常 - Log.e(TAG, e.toString()); - return STATE_INTERNAL_ERROR; - } catch (Exception e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return STATE_INTERNAL_ERROR; - } finally { - mGTaskListHashMap.clear(); - mGTaskHashMap.clear(); - mMetaHashMap.clear(); - mLocalDeleteIdMap.clear(); - mGidToNid.clear(); - mNidToGid.clear(); - mSyncing = false; - } - - return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS; - } - - /** - *功能:初始化GtaskList,获取Google上的JSONtasklist转为本地TaskList。 - *获得的数据存储在mMetaList,mGTaskListHashMap,mGTaskHashMap - *@author TTS - *@exception NetworkFailureException - *@return void - */ - private void initGTaskList() throws NetworkFailureException { - if (mCancelled) - return; - GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例,client应指远端客户机 - try { - //Json对象是Name Value对(即子元素)的无序集合,相当于一个Map对象。JsonObject类是bantouyan-json库对Json对象的抽象,提供操纵Json对象的各种方法。 - //其格式为{"key1":value1,"key2",value2....};key 必须是字符串。 - //因为ajax请求不刷新页面,但配合js可以实现局部刷新,因此json常常被用来作为异步请求的返回对象使用。 - JSONArray jsTaskLists = client.getTaskLists(); //原注释为get task list------lists??? - - // init meta list first - mMetaList = null; //TaskList类型 - for (int i = 0; i < jsTaskLists.length(); i++) { - JSONObject object = jsTaskLists.getJSONObject(i); //JSONObject与JSONArray一个为对象,一个为数组。此处取出单个JASONObject - String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); - String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME); - - if (name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) { - mMetaList = new TaskList(); //MetaList意为元表,Tasklist类型,此处为初始化 - mMetaList.setContentByRemoteJSON(object); //将JSON中部分数据复制到自己定义的对象中相对应的数据:name->mname... - - // load meta data - JSONArray jsMetas = client.getTaskList(gid); //原注释为get action_list------list??? - for (int j = 0; j < jsMetas.length(); j++) { - object = (JSONObject) jsMetas.getJSONObject(j); - MetaData metaData = new MetaData(); //继承自Node - metaData.setContentByRemoteJSON(object); - if (metaData.isWorthSaving()) { //if not worth to save,metadata将不加入mMetaList - mMetaList.addChildTask(metaData); - if (metaData.getGid() != null) { - mMetaHashMap.put(metaData.getRelatedGid(), metaData); - } - } - } - } - } - - // create meta list if not existed - if (mMetaList == null) { - mMetaList = new TaskList(); - mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_META); - GTaskClient.getInstance().createTaskList(mMetaList); - } - - // init task list - for (int i = 0; i < jsTaskLists.length(); i++) { - JSONObject object = jsTaskLists.getJSONObject(i); - String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); //通过getString函数传入本地某个标志数据的名称,获取其在远端的名称。 - String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME); - - if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX) - && !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_META)) { - TaskList tasklist = new TaskList(); //继承自Node - tasklist.setContentByRemoteJSON(object); - mGTaskListHashMap.put(gid, tasklist); - mGTaskHashMap.put(gid, tasklist); //为什么加两遍??? - - // load tasks - JSONArray jsTasks = client.getTaskList(gid); - for (int j = 0; j < jsTasks.length(); j++) { - object = (JSONObject) jsTasks.getJSONObject(j); - gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); - Task task = new Task(); - task.setContentByRemoteJSON(object); - if (task.isWorthSaving()) { - task.setMetaInfo(mMetaHashMap.get(gid)); - tasklist.addChildTask(task); - mGTaskHashMap.put(gid, task); - } - } - } - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("initGTaskList: handing JSONObject failed"); - } - } - - /** - * 功能:本地内容同步操作 - * @throws NetworkFailureException - * @return 无返回值 - */ - private void syncContent() throws NetworkFailureException { //本地内容同步操作 - int syncType; - Cursor c = null; //数据库指针 - String gid; //GoogleID?? - Node node; //Node包含Sync_Action的不同类型 - - mLocalDeleteIdMap.clear(); //HashSet类型 - - if (mCancelled) { - return; - } - - // for local deleted note - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type<>? AND parent_id=?)", new String[] { - String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER) - }, null); - if (c != null) { - while (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c); - } - - mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN)); - } - } else { - Log.w(TAG, "failed to query trash folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // sync folder first - syncFolder(); - - // for note existing in database - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type=? AND parent_id<>?)", new String[] { - String.valueOf(Notes.TYPE_NOTE), String.valueOf(Notes.ID_TRASH_FOLER) - }, NoteColumns.TYPE + " DESC"); - if (c != null) { - while (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); //通过hashmap建立联系 - mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); //通过hashmap建立联系 - syncType = node.getSyncAction(c); - } else { - if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) { - // local add - syncType = Node.SYNC_ACTION_ADD_REMOTE; - } else { - // remote delete - syncType = Node.SYNC_ACTION_DEL_LOCAL; - } - } - doContentSync(syncType, node, c); - } - } else { - Log.w(TAG, "failed to query existing note in database"); - } - - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // go through remaining items - Iterator> iter = mGTaskHashMap.entrySet().iterator(); //Iterator迭代器 - while (iter.hasNext()) { - Map.Entry entry = iter.next(); - node = entry.getValue(); - doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); - } - - // mCancelled can be set by another thread, so we neet to check one by //thread----线程 - // one - // clear local delete table - if (!mCancelled) { - if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) { - throw new ActionFailureException("failed to batch-delete local deleted notes"); - } - } - - // refresh local sync id - if (!mCancelled) { - GTaskClient.getInstance().commitUpdate(); - refreshLocalSyncId(); - } - - } - - /** - * 功能: - * @author TTS - * @throws NetworkFailureException - */ - private void syncFolder() throws NetworkFailureException { - Cursor c = null; - String gid; - Node node; - int syncType; - - if (mCancelled) { - return; - } - - // for root folder - try { - c = mContentResolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, - Notes.ID_ROOT_FOLDER), SqlNote.PROJECTION_NOTE, null, null, null); - if (c != null) { - c.moveToNext(); - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER); - mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid); - // for system folder, only update remote name if necessary - if (!node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) - doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c); - } else { - doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c); - } - } else { - Log.w(TAG, "failed to query root folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // for call-note folder - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)", - new String[] { - String.valueOf(Notes.ID_CALL_RECORD_FOLDER) - }, null); - if (c != null) { - if (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER); - mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid); - // for system folder, only update remote name if - // necessary - if (!node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_CALL_NOTE)) - doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c); - } else { - doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c); - } - } - } else { - Log.w(TAG, "failed to query call note folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // for local existing folders - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type=? AND parent_id<>?)", new String[] { - String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER) - }, NoteColumns.TYPE + " DESC"); - if (c != null) { - while (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); - mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); - syncType = node.getSyncAction(c); - } else { - if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) { - // local add - syncType = Node.SYNC_ACTION_ADD_REMOTE; - } else { - // remote delete - syncType = Node.SYNC_ACTION_DEL_LOCAL; - } - } - doContentSync(syncType, node, c); - } - } else { - Log.w(TAG, "failed to query existing folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // for remote add folders - Iterator> iter = mGTaskListHashMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = iter.next(); - gid = entry.getKey(); - node = entry.getValue(); - if (mGTaskHashMap.containsKey(gid)) { - mGTaskHashMap.remove(gid); - doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); - } - } - - if (!mCancelled) - GTaskClient.getInstance().commitUpdate(); - } - - /** - * 功能:syncType分类,addLocalNode,addRemoteNode,deleteNode,updateLocalNode,updateRemoteNode - * @author TTS - * @param syncType - * @param node - * @param c - * @throws NetworkFailureException - */ - private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - MetaData meta; - switch (syncType) { - case Node.SYNC_ACTION_ADD_LOCAL: - addLocalNode(node); - break; - case Node.SYNC_ACTION_ADD_REMOTE: - addRemoteNode(node, c); - break; - case Node.SYNC_ACTION_DEL_LOCAL: - meta = mMetaHashMap.get(c.getString(SqlNote.GTASK_ID_COLUMN)); - if (meta != null) { - GTaskClient.getInstance().deleteNode(meta); - } - mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN)); - break; - case Node.SYNC_ACTION_DEL_REMOTE: - meta = mMetaHashMap.get(node.getGid()); - if (meta != null) { - GTaskClient.getInstance().deleteNode(meta); - } - GTaskClient.getInstance().deleteNode(node); - break; - case Node.SYNC_ACTION_UPDATE_LOCAL: - updateLocalNode(node, c); - break; - case Node.SYNC_ACTION_UPDATE_REMOTE: - updateRemoteNode(node, c); - break; - case Node.SYNC_ACTION_UPDATE_CONFLICT: - // merging both modifications maybe a good idea - // right now just use local update simply - updateRemoteNode(node, c); - break; - case Node.SYNC_ACTION_NONE: - break; - case Node.SYNC_ACTION_ERROR: - default: - throw new ActionFailureException("unkown sync action type"); - } - } - - /** - * 功能:本地增加Node - * @author TTS - * @param node - * @throws NetworkFailureException - */ - private void addLocalNode(Node node) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote; - if (node instanceof TaskList) { - if (node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) { - sqlNote = new SqlNote(mContext, Notes.ID_ROOT_FOLDER); - } else if (node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE)) { - sqlNote = new SqlNote(mContext, Notes.ID_CALL_RECORD_FOLDER); - } else { - sqlNote = new SqlNote(mContext); - sqlNote.setContent(node.getLocalJSONFromContent()); - sqlNote.setParentId(Notes.ID_ROOT_FOLDER); - } - } else { - sqlNote = new SqlNote(mContext); - JSONObject js = node.getLocalJSONFromContent(); - try { - if (js.has(GTaskStringUtils.META_HEAD_NOTE)) { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - if (note.has(NoteColumns.ID)) { - long id = note.getLong(NoteColumns.ID); - if (DataUtils.existInNoteDatabase(mContentResolver, id)) { - // the id is not available, have to create a new one - note.remove(NoteColumns.ID); - } - } - } - - if (js.has(GTaskStringUtils.META_HEAD_DATA)) { - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - if (data.has(DataColumns.ID)) { - long dataId = data.getLong(DataColumns.ID); - if (DataUtils.existInDataDatabase(mContentResolver, dataId)) { - // the data id is not available, have to create - // a new one - data.remove(DataColumns.ID); - } - } - } - - } - } catch (JSONException e) { - Log.w(TAG, e.toString()); - e.printStackTrace(); - } - sqlNote.setContent(js); - - Long parentId = mGidToNid.get(((Task) node).getParent().getGid()); - if (parentId == null) { - Log.e(TAG, "cannot find task's parent id locally"); - throw new ActionFailureException("cannot add local node"); - } - sqlNote.setParentId(parentId.longValue()); - } - - // create the local node - sqlNote.setGtaskId(node.getGid()); - sqlNote.commit(false); - - // update gid-nid mapping - mGidToNid.put(node.getGid(), sqlNote.getId()); - mNidToGid.put(sqlNote.getId(), node.getGid()); - - // update meta - updateRemoteMeta(node.getGid(), sqlNote); - } - - /** - * 功能:update本地node - * @author TTS - * @param node - * ----同步操作的基础数据类型 - * @param c - * ----Cursor - * @throws NetworkFailureException - */ - private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote; - // update the note locally - sqlNote = new SqlNote(mContext, c); - sqlNote.setContent(node.getLocalJSONFromContent()); - - Long parentId = (node instanceof Task) ? mGidToNid.get(((Task) node).getParent().getGid()) - : new Long(Notes.ID_ROOT_FOLDER); - if (parentId == null) { - Log.e(TAG, "cannot find task's parent id locally"); - throw new ActionFailureException("cannot update local node"); - } - sqlNote.setParentId(parentId.longValue()); - sqlNote.commit(true); - - // update meta info - updateRemoteMeta(node.getGid(), sqlNote); - } - - /** - * 功能:远程增加Node - * 需要updateRemoteMeta - * @author TTS - * @param node - * ----同步操作的基础数据类型 - * @param c - * --Cursor - * @throws NetworkFailureException - */ - private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote = new SqlNote(mContext, c); //从本地mContext中获取内容 - Node n; - - // update remotely - if (sqlNote.isNoteType()) { - Task task = new Task(); - task.setContentByLocalJSON(sqlNote.getContent()); - - String parentGid = mNidToGid.get(sqlNote.getParentId()); - if (parentGid == null) { - Log.e(TAG, "cannot find task's parent tasklist"); //调试信息 - throw new ActionFailureException("cannot add remote task"); - } - mGTaskListHashMap.get(parentGid).addChildTask(task); //在本地生成的GTaskList中增加子结点 - - //登录远程服务器,创建Task - GTaskClient.getInstance().createTask(task); - n = (Node) task; - - // add meta - updateRemoteMeta(task.getGid(), sqlNote); - } else { - TaskList tasklist = null; - - // we need to skip folder if it has already existed - String folderName = GTaskStringUtils.MIUI_FOLDER_PREFFIX; - if (sqlNote.getId() == Notes.ID_ROOT_FOLDER) - folderName += GTaskStringUtils.FOLDER_DEFAULT; - else if (sqlNote.getId() == Notes.ID_CALL_RECORD_FOLDER) - folderName += GTaskStringUtils.FOLDER_CALL_NOTE; - else - folderName += sqlNote.getSnippet(); - - //iterator迭代器,通过统一的接口迭代所有的map元素 - Iterator> iter = mGTaskListHashMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = iter.next(); - String gid = entry.getKey(); - TaskList list = entry.getValue(); - - if (list.getName().equals(folderName)) { - tasklist = list; - if (mGTaskHashMap.containsKey(gid)) { - mGTaskHashMap.remove(gid); - } - break; - } - } - - // no match we can add now - if (tasklist == null) { - tasklist = new TaskList(); - tasklist.setContentByLocalJSON(sqlNote.getContent()); - GTaskClient.getInstance().createTaskList(tasklist); - mGTaskListHashMap.put(tasklist.getGid(), tasklist); - } - n = (Node) tasklist; - } - - // update local note - sqlNote.setGtaskId(n.getGid()); - sqlNote.commit(false); - sqlNote.resetLocalModified(); - sqlNote.commit(true); - - // gid-id mapping //创建id间的映射 - mGidToNid.put(n.getGid(), sqlNote.getId()); - mNidToGid.put(sqlNote.getId(), n.getGid()); - } - - /** - * 功能:更新远端的Node,包含meta更新(updateRemoteMeta) - * @author TTS - * @param node - * ----同步操作的基础数据类型 - * @param c - * --Cursor - * @throws NetworkFailureException - */ - private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote = new SqlNote(mContext, c); - - // update remotely - node.setContentByLocalJSON(sqlNote.getContent()); - GTaskClient.getInstance().addUpdateNode(node); //GTaskClient用途为从本地登陆远端服务器 - - // update meta - updateRemoteMeta(node.getGid(), sqlNote); - - // move task if necessary - if (sqlNote.isNoteType()) { - Task task = (Task) node; - TaskList preParentList = task.getParent(); - //preParentList为通过node获取的父节点列表 - - String curParentGid = mNidToGid.get(sqlNote.getParentId()); - //curParentGid为通过光标在数据库中找到sqlNote的mParentId,再通过mNidToGid由long类型转为String类型的Gid - - if (curParentGid == null) { - Log.e(TAG, "cannot find task's parent tasklist"); - throw new ActionFailureException("cannot update remote task"); - } - TaskList curParentList = mGTaskListHashMap.get(curParentGid); - //通过HashMap找到对应Gid的TaskList - - if (preParentList != curParentList) { //????????????? - preParentList.removeChildTask(task); - curParentList.addChildTask(task); - GTaskClient.getInstance().moveTask(task, preParentList, curParentList); - } - } - - // clear local modified flag - sqlNote.resetLocalModified(); - //commit到本地数据库 - sqlNote.commit(true); - } - - /** - * 功能:升级远程meta。 meta---元数据----计算机文件系统管理数据---管理数据的数据。 - * @author TTS - * @param gid - * ---GoogleID为String类型 - * @param sqlNote - * ---同步前的数据库操作,故使用类SqlNote - * @throws NetworkFailureException - */ - private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException { - if (sqlNote != null && sqlNote.isNoteType()) { - MetaData metaData = mMetaHashMap.get(gid); - if (metaData != null) { - metaData.setMeta(gid, sqlNote.getContent()); - GTaskClient.getInstance().addUpdateNode(metaData); - } else { - metaData = new MetaData(); - metaData.setMeta(gid, sqlNote.getContent()); - mMetaList.addChildTask(metaData); - mMetaHashMap.put(gid, metaData); - GTaskClient.getInstance().createTask(metaData); - } - } - } - - /** - * 功能:刷新本地,给sync的ID对应上最后更改过的对象 - * @author TTS - * @return void - * @throws NetworkFailureException - */ - private void refreshLocalSyncId() throws NetworkFailureException { - if (mCancelled) { - return; - } - - // get the latest gtask list //获取最近的(最晚的)gtask list - mGTaskHashMap.clear(); - mGTaskListHashMap.clear(); - mMetaHashMap.clear(); - initGTaskList(); - - Cursor c = null; - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type<>? AND parent_id<>?)", new String[] { - String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER) - }, NoteColumns.TYPE + " DESC"); //query语句:五个参数,NoteColumns.TYPE + " DESC"-----为按类型递减顺序返回查询结果。new String[] {String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)}------为选择参数。"(type<>? AND parent_id<>?)"-------指明返回行过滤器。SqlNote.PROJECTION_NOTE--------应返回的数据列的名字。Notes.CONTENT_NOTE_URI--------contentProvider包含所有数据集所对应的uri - if (c != null) { - while (c.moveToNext()) { - String gid = c.getString(SqlNote.GTASK_ID_COLUMN); - Node node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - ContentValues values = new ContentValues(); //在ContentValues中创建键值对。准备通过contentResolver写入数据 - values.put(NoteColumns.SYNC_ID, node.getLastModified()); - mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, //进行批量更改,选择参数为NULL,应该可以用insert替换,参数分别为表名和需要更新的value对象。 - c.getLong(SqlNote.ID_COLUMN)), values, null, null); - } else { - Log.e(TAG, "something is missed"); - throw new ActionFailureException( - "some local items don't have gid after sync"); - } - } - } else { - Log.w(TAG, "failed to query local note to refresh sync id"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - } - - /** - * 功能:获取同步账号,mAccount.name - * @author TTS - * @return String - */ - public String getSyncAccount() { - return GTaskClient.getInstance().getSyncAccount().name; - } - - /** - * 功能:取消同步,置mCancelled为true - * @author TTS - */ - public void cancelSync() { - mCancelled = true; - } -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java deleted file mode 100644 index 0aca15e..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.remote; - -import android.app.Activity; -import android.app.Service; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.os.IBinder; - - -/* - * Service是在一段不定的时间运行在后台,不和用户交互的应用组件 - * 主要方法: - * private void startSync() 启动一个同步工作 - * private void cancelSync() 取消同步 - * public void onCreate() - * public int onStartCommand(Intent intent, int flags, int startId) service生命周期的组成部分,相当于重启service(比如在被暂停之后),而不是创建一个新的service - * public void onLowMemory() 在没有内存的情况下如果存在service则结束掉这的service - * public IBinder onBind() - * public void sendBroadcast(String msg) 发送同步的相关通知 - * public static void startSync(Activity activity) - * public static void cancelSync(Context context) - * public static boolean isSyncing() 判读是否在进行同步 - * public static String getProgressString() 获取当前进度的信息 - */ - -public class GTaskSyncService extends Service { - public final static String ACTION_STRING_NAME = "sync_action_type"; - - public final static int ACTION_START_SYNC = 0; - - public final static int ACTION_CANCEL_SYNC = 1; - - public final static int ACTION_INVALID = 2; - - public final static String GTASK_SERVICE_BROADCAST_NAME = "net.micode.notes.gtask.remote.gtask_sync_service"; - - public final static String GTASK_SERVICE_BROADCAST_IS_SYNCING = "isSyncing"; - - public final static String GTASK_SERVICE_BROADCAST_PROGRESS_MSG = "progressMsg"; - - private static GTaskASyncTask mSyncTask = null; - - private static String mSyncProgress = ""; - - //开始一个同步的工作 - private void startSync() { - if (mSyncTask == null) { - mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() { - public void onComplete() { - mSyncTask = null; - sendBroadcast(""); - stopSelf(); - } - }); - sendBroadcast(""); - mSyncTask.execute(); //这个函数让任务是以单线程队列方式或线程池队列方式运行 - } - } - - - private void cancelSync() { - if (mSyncTask != null) { - mSyncTask.cancelSync(); - } - } - - @Override - public void onCreate() { //初始化一个service - mSyncTask = null; - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - Bundle bundle = intent.getExtras(); - if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) { - switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) { - //两种情况,开始同步或者取消同步 - case ACTION_START_SYNC: - startSync(); - break; - case ACTION_CANCEL_SYNC: - cancelSync(); - break; - default: - break; - } - return START_STICKY; //等待新的intent来是这个service继续运行 - } - return super.onStartCommand(intent, flags, startId); - } - - @Override - public void onLowMemory() { - if (mSyncTask != null) { - mSyncTask.cancelSync(); - } - } - - public IBinder onBind(Intent intent) { //不知道干吗用的 - return null; - } - - public void sendBroadcast(String msg) { - mSyncProgress = msg; - Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME); //创建一个新的Intent - intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null); //附加INTENT中的相应参数的值 - intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg); - sendBroadcast(intent); //发送这个通知 - } - - public static void startSync(Activity activity) {//执行一个service,service的内容里的同步动作就是开始同步 - GTaskManager.getInstance().setActivityContext(activity); - Intent intent = new Intent(activity, GTaskSyncService.class); - intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC); - activity.startService(intent); - } - - public static void cancelSync(Context context) {//执行一个service,service的内容里的同步动作就是取消同步 - Intent intent = new Intent(context, GTaskSyncService.class); - intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC); - context.startService(intent); - } - - public static boolean isSyncing() { - return mSyncTask != null; - } - - public static String getProgressString() { - return mSyncProgress; - } -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master3/app/src/main/java/net/micode/notes/model/Note.java deleted file mode 100644 index d1f1de4..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/model/Note.java +++ /dev/null @@ -1,232 +0,0 @@ -package net.micode.notes.model; - -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;//输出日志,比如说出错、警告等 - -public class Note { - // private ContentValues mNoteDiffValues; - ContentValues mNoteDiffValues;// - private NoteData mNoteData; - private static final String TAG = "Note"; - - /** - * Create a new note id for adding a new note to databases - */ - public static synchronized long getNewNoteId(Context context, long folderId) { - // Create a new note in the database - ContentValues values = new ContentValues(); - long createdTime = System.currentTimeMillis(); - values.put(NoteColumns.CREATED_DATE, createdTime); - 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);//将数据写入数据库表格 - 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); - } - return noteId; - } - - 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) { - throw new IllegalArgumentException("Wrong note id:" + noteId); - } - - if (!isLocalModified()) { - return true; - } - - /** - * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and - * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the - * note data info - */ - if (context.getContentResolver().update( - ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null, - null) == 0) { - Log.e(TAG, "Update note error, should not happen"); - // Do not return, fall through - } - mNoteDiffValues.clear(); - - if (mNoteData.isLocalModified() - && (mNoteData.pushIntoContentResolver(context, noteId) == null)) { - return false; - } - - return true; - }//判断数据是否同步 - - private class NoteData {//定义一个基本的便签内容的数据类,主要包含文本数据和电话号码数据 - private long mTextDataId; - - private ContentValues mTextDataValues;//文本数据 - - private long mCallDataId; - - private ContentValues mCallDataValues;//电话号码数据 - - private static final String TAG = "NoteData"; - - public NoteData() { - mTextDataValues = new ContentValues(); - mCallDataValues = new ContentValues(); - mTextDataId = 0; - mCallDataId = 0; - } - //下面是上述几个函数的具体实现 - boolean isLocalModified() { - return mTextDataValues.size() > 0 || mCallDataValues.size() > 0; - } - - void setTextDataId(long id) { - if(id <= 0) { - throw new IllegalArgumentException("Text data id should larger than 0"); - } - mTextDataId = id; - } - - void setCallDataId(long id) { - if (id <= 0) { - throw new IllegalArgumentException("Call data id should larger than 0"); - } - mCallDataId = id; - } - - void setCallData(String key, String value) { - mCallDataValues.put(key, value); - mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); - mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } - - void setTextData(String key, String value) { - mTextDataValues.put(key, value); - 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;//数据库的操作列表 - - if(mTextDataValues.size() > 0) { - mTextDataValues.put(DataColumns.NOTE_ID, noteId); - if (mTextDataId == 0) { - mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, - mTextDataValues); - try { - setTextDataId(Long.valueOf(uri.getPathSegments().get(1))); - } catch (NumberFormatException e) { - Log.e(TAG, "Insert new text data fail with noteId" + noteId); - mTextDataValues.clear(); - return null; - } - } else { - builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mTextDataId)); - builder.withValues(mTextDataValues); - operationList.add(builder.build()); - } - mTextDataValues.clear(); - }//把文本数据存入DataColumns - - if(mCallDataValues.size() > 0) { - mCallDataValues.put(DataColumns.NOTE_ID, noteId); - if (mCallDataId == 0) { - mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, - mCallDataValues); - try { - setCallDataId(Long.valueOf(uri.getPathSegments().get(1))); - } catch (NumberFormatException e) { - Log.e(TAG, "Insert new call data fail with noteId" + noteId); - mCallDataValues.clear(); - return null; - } - } else { - builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mCallDataId)); - builder.withValues(mCallDataValues); - operationList.add(builder.build()); - } - mCallDataValues.clear(); - }//把电话号码数据存入DataColumns - - if (operationList.size() > 0) { - try { - ContentProviderResult[] results = context.getContentResolver().applyBatch( - Notes.AUTHORITY, operationList); - return (results == null || results.length == 0 || results[0] == null) ? null - : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId); - } catch (RemoteException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - return null; - } catch (OperationApplicationException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - return null; - } - }//存储过程中的异常处理 - return null; - } - } -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master3/app/src/main/java/net/micode/notes/model/WorkingNote.java deleted file mode 100644 index cbb0754..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ /dev/null @@ -1,375 +0,0 @@ -package net.micode.notes.model; - -public class WorkingNote { - // Note for the working note - private Note mNote; - // Note Id - private long mNoteId; - // Note content - private String mContent; - // Note mode - 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"; - - private boolean mIsDeleted; - - private NoteSettingChangedListener mNoteSettingStatusListener; - - // 声明 DATA_PROJECTION字符串数组 - public static final String[] DATA_PROJECTION = new String[] { - DataColumns.ID, - DataColumns.CONTENT, - DataColumns.MIME_TYPE, - DataColumns.DATA1, - DataColumns.DATA2, - DataColumns.DATA3, - DataColumns.DATA4, - }; - - // 声明 NOTE_PROJECTION字符串数组 - public static final String[] NOTE_PROJECTION = new String[] { - NoteColumns.PARENT_ID, - NoteColumns.ALERTED_DATE, - NoteColumns.BG_COLOR_ID, - NoteColumns.WIDGET_ID, - NoteColumns.WIDGET_TYPE, - NoteColumns.MODIFIED_DATE - }; - - 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 - public WorkingNote(Context context, long folderId) { - mContext = context; - mAlertDate = 0; - mModifiedDate = System.currentTimeMillis(); - mFolderId = folderId; - mNote = new Note(); - mNoteId = 0; - mIsDeleted = false; - mMode = 0; - mWidgetType = Notes.TYPE_WIDGET_INVALIDE; - } - - // WorkingNote的构造函数 - // Existing note construct - - private WorkingNote(Context context, long noteId, long folderId) { - mContext = context; - mNoteId = noteId; - mFolderId = folderId; - mIsDeleted = false; - mNote = new Note(); - 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); - mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN); - mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN); - mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN); - mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN); - 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); - } - loadNoteData(); - } - - // 加载NoteData - private void loadNoteData() { - Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, - DataColumns.NOTE_ID + "=?", new String[] { - String.valueOf(mNoteId) - }, null); - - if (cursor != null) { - // 查到信息不为空 - if (cursor.moveToFirst()) { // 查看第一项是否存在 - do { - String type = cursor.getString(DATA_MIME_TYPE_COLUMN); - if (DataConstants.NOTE.equals(type)) { - mContent = cursor.getString(DATA_CONTENT_COLUMN); - mMode = cursor.getInt(DATA_MODE_COLUMN); - mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN)); - } else if (DataConstants.CALL_NOTE.equals(type)) { - mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN)); - } else { - Log.d(TAG, "Wrong note type with type:" + type); - } - } while (cursor.moveToNext());//查阅所有项,直到为空 - } - cursor.close(); - } else { - Log.e(TAG, "No data with id:" + mNoteId); - throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId); - } - } - - // 创建空的Note - // 传参:context,文件夹id,widget,背景颜色 - public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId, - int widgetType, int defaultBgColorId) { - WorkingNote note = new WorkingNote(context, folderId); - // 设定相关属性 - note.setBgColorId(defaultBgColorId); - note.setWidgetId(widgetId); - note.setWidgetType(widgetType); - return note; - } - - public static WorkingNote load(Context context, long id) { - return new WorkingNote(context, id, 0); - } - - // 保存Note - public synchronized boolean saveNote() { - if (isWorthSaving()) { //是否值得保存 - if (!existInDatabase()) { // 是否存在数据库中 - if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) { - Log.e(TAG, "Create new note fail with id:" + mNoteId); - return false; - } - } - - mNote.syncNote(mContext, mNoteId); - - /** - * Update widget content if there exist any widget of this note - */ - if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID - && mWidgetType != Notes.TYPE_WIDGET_INVALIDE - && mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onWidgetChanged(); - } - return true; - } else { - return false; - } - } - - // 是否在数据库中存在 - public boolean existInDatabase() { - return mNoteId > 0; - } - - // 是否值得保存 - private boolean isWorthSaving() { - // 被删除,或(不在数据库中 内容为空),或 本地已保存过 - if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent)) - || (existInDatabase() && !mNote.isLocalModified())) { - return false; - } else { - return true; - } - } - - - // 设置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; - mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate)); - } - if (mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onClockAlertChanged(date, set); - } - } - - // 设定删除标记 - public void markDeleted(boolean mark) { - // 设定标记 - mIsDeleted = mark; - if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID - && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onWidgetChanged(); - // 调用mNoteSettingStatusListener的 onWidgetChanged方法 - } - } - - // 设定背景颜色 - public void setBgColorId(int id) { - if (id != mBgColorId) { //设定条件 id != mBgColorId - mBgColorId = id; - if (mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onBackgroundColorChanged(); - } - mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id)); - } - } - - // 设定检查列表模式 - // 参数:mode - public void setCheckListMode(int mode) { - if (mMode != mode) { //设定条件 mMode != mode - if (mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode); - } - mMode = mode; - mNote.setTextData(TextNote.MODE, String.valueOf(mMode)); - } - } - - - // 设定WidgetType - // 参数:type - public void setWidgetType(int type) { - 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) {//设定条件 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)) {//设定条件 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 - */ - void onBackgroundColorChanged(); - - /** - * Called when user set clock - */ - void onClockAlertChanged(long date, boolean set); - - /** - * Call when user create note from widget - */ - void onWidgetChanged(); - - /** - * Call when switch between check list mode and normal mode - * @param oldMode is previous mode before change - * @param newMode is new mode - */ - void onCheckListModeChanged(int oldMode, int newMode); - } -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java deleted file mode 100644 index 39f6ec4..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java +++ /dev/null @@ -1,344 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.tool; - -import android.content.Context; -import android.database.Cursor; -import android.os.Environment; -import android.text.TextUtils; -import android.text.format.DateFormat; -import android.util.Log; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.DataConstants; -import net.micode.notes.data.Notes.NoteColumns; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintStream; - - -public class BackupUtils { - private static final String TAG = "BackupUtils"; - // Singleton stuff - private static BackupUtils sInstance; - - public static synchronized BackupUtils getInstance(Context context) { - if (sInstance == null) { - sInstance = new BackupUtils(context); - } - return sInstance; - } - - /** - * Following states are signs to represents backup or restore - * status - */ - // Currently, the sdcard is not mounted - public static final int STATE_SD_CARD_UNMOUONTED = 0; - // The backup file not exist - public static final int STATE_BACKUP_FILE_NOT_EXIST = 1; - // The data is not well formated, may be changed by other programs - public static final int STATE_DATA_DESTROIED = 2; - // Some run-time exception which causes restore or backup fails - public static final int STATE_SYSTEM_ERROR = 3; - // Backup or restore success - public static final int STATE_SUCCESS = 4; - - private TextExport mTextExport; - - private BackupUtils(Context context) { - mTextExport = new TextExport(context); - } - - private static boolean externalStorageAvailable() { - return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()); - } - - public int exportToText() { - return mTextExport.exportToText(); - } - - public String getExportedTextFileName() { - return mTextExport.mFileName; - } - - public String getExportedTextFileDir() { - return mTextExport.mFileDirectory; - } - - private static class TextExport { - private static final String[] NOTE_PROJECTION = { - NoteColumns.ID, - NoteColumns.MODIFIED_DATE, - NoteColumns.SNIPPET, - NoteColumns.TYPE - }; - - private static final int NOTE_COLUMN_ID = 0; - - private static final int NOTE_COLUMN_MODIFIED_DATE = 1; - - private static final int NOTE_COLUMN_SNIPPET = 2; - - private static final String[] DATA_PROJECTION = { - DataColumns.CONTENT, - DataColumns.MIME_TYPE, - DataColumns.DATA1, - DataColumns.DATA2, - DataColumns.DATA3, - DataColumns.DATA4, - }; - - private static final int DATA_COLUMN_CONTENT = 0; - - private static final int DATA_COLUMN_MIME_TYPE = 1; - - private static final int DATA_COLUMN_CALL_DATE = 2; - - private static final int DATA_COLUMN_PHONE_NUMBER = 4; - - private final String [] TEXT_FORMAT; - private static final int FORMAT_FOLDER_NAME = 0; - private static final int FORMAT_NOTE_DATE = 1; - private static final int FORMAT_NOTE_CONTENT = 2; - - private Context mContext; - private String mFileName; - private String mFileDirectory; - - public TextExport(Context context) { - TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note); - mContext = context; - mFileName = ""; - mFileDirectory = ""; - } - - private String getFormat(int id) { - return TEXT_FORMAT[id]; - } - - /** - * Export the folder identified by folder id to text - */ - private void exportFolderToText(String folderId, PrintStream ps) { - // Query notes belong to this folder - Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI, - NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] { - folderId - }, null); - - if (notesCursor != null) { - if (notesCursor.moveToFirst()) { - do { - // Print note's last modified date - ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format( - mContext.getString(R.string.format_datetime_mdhm), - notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE)))); - // Query data belong to this note - String noteId = notesCursor.getString(NOTE_COLUMN_ID); - exportNoteToText(noteId, ps); - } while (notesCursor.moveToNext()); - } - notesCursor.close(); - } - } - - /** - * Export note identified by id to a print stream - */ - private void exportNoteToText(String noteId, PrintStream ps) { - Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, - DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] { - noteId - }, null); - - if (dataCursor != null) { - if (dataCursor.moveToFirst()) { - do { - String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE); - if (DataConstants.CALL_NOTE.equals(mimeType)) { - // Print phone number - String phoneNumber = dataCursor.getString(DATA_COLUMN_PHONE_NUMBER); - long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE); - String location = dataCursor.getString(DATA_COLUMN_CONTENT); - - if (!TextUtils.isEmpty(phoneNumber)) { - ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), - phoneNumber)); - } - // Print call date - ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), DateFormat - .format(mContext.getString(R.string.format_datetime_mdhm), - callDate))); - // Print call attachment location - if (!TextUtils.isEmpty(location)) { - ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), - location)); - } - } else if (DataConstants.NOTE.equals(mimeType)) { - String content = dataCursor.getString(DATA_COLUMN_CONTENT); - if (!TextUtils.isEmpty(content)) { - ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), - content)); - } - } - } while (dataCursor.moveToNext()); - } - dataCursor.close(); - } - // print a line separator between note - try { - ps.write(new byte[] { - Character.LINE_SEPARATOR, Character.LETTER_NUMBER - }); - } catch (IOException e) { - Log.e(TAG, e.toString()); - } - } - - /** - * Note will be exported as text which is user readable - */ - public int exportToText() { - if (!externalStorageAvailable()) { - Log.d(TAG, "Media was not mounted"); - return STATE_SD_CARD_UNMOUONTED; - } - - PrintStream ps = getExportToTextPrintStream(); - if (ps == null) { - Log.e(TAG, "get print stream error"); - return STATE_SYSTEM_ERROR; - } - // First export folder and its notes - Cursor folderCursor = mContext.getContentResolver().query( - Notes.CONTENT_NOTE_URI, - NOTE_PROJECTION, - "(" + NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + " AND " - + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + ") OR " - + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER, null, null); - - if (folderCursor != null) { - if (folderCursor.moveToFirst()) { - do { - // Print folder's name - String folderName = ""; - if(folderCursor.getLong(NOTE_COLUMN_ID) == Notes.ID_CALL_RECORD_FOLDER) { - folderName = mContext.getString(R.string.call_record_folder_name); - } else { - folderName = folderCursor.getString(NOTE_COLUMN_SNIPPET); - } - if (!TextUtils.isEmpty(folderName)) { - ps.println(String.format(getFormat(FORMAT_FOLDER_NAME), folderName)); - } - String folderId = folderCursor.getString(NOTE_COLUMN_ID); - exportFolderToText(folderId, ps); - } while (folderCursor.moveToNext()); - } - folderCursor.close(); - } - - // Export notes in root's folder - Cursor noteCursor = mContext.getContentResolver().query( - Notes.CONTENT_NOTE_URI, - NOTE_PROJECTION, - NoteColumns.TYPE + "=" + +Notes.TYPE_NOTE + " AND " + NoteColumns.PARENT_ID - + "=0", null, null); - - if (noteCursor != null) { - if (noteCursor.moveToFirst()) { - do { - ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format( - mContext.getString(R.string.format_datetime_mdhm), - noteCursor.getLong(NOTE_COLUMN_MODIFIED_DATE)))); - // Query data belong to this note - String noteId = noteCursor.getString(NOTE_COLUMN_ID); - exportNoteToText(noteId, ps); - } while (noteCursor.moveToNext()); - } - noteCursor.close(); - } - ps.close(); - - return STATE_SUCCESS; - } - - /** - * Get a print stream pointed to the file {@generateExportedTextFile} - */ - private PrintStream getExportToTextPrintStream() { - File file = generateFileMountedOnSDcard(mContext, R.string.file_path, - R.string.file_name_txt_format); - if (file == null) { - Log.e(TAG, "create file to exported failed"); - return null; - } - mFileName = file.getName(); - mFileDirectory = mContext.getString(R.string.file_path); - PrintStream ps = null; - try { - FileOutputStream fos = new FileOutputStream(file); - ps = new PrintStream(fos); - } catch (FileNotFoundException e) { - e.printStackTrace(); - return null; - } catch (NullPointerException e) { - e.printStackTrace(); - return null; - } - return ps; - } - } - - /** - * Generate the text file to store imported data - */ - private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) { - StringBuilder sb = new StringBuilder(); - sb.append(Environment.getExternalStorageDirectory()); - sb.append(context.getString(filePathResId)); - File filedir = new File(sb.toString()); - sb.append(context.getString( - fileNameFormatResId, - DateFormat.format(context.getString(R.string.format_date_ymd), - System.currentTimeMillis()))); - File file = new File(sb.toString()); - - try { - if (!filedir.exists()) { - filedir.mkdir(); - } - if (!file.exists()) { - file.createNewFile(); - } - return file; - } catch (SecurityException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - - return null; - } -} - - diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java deleted file mode 100644 index 2a14982..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java +++ /dev/null @@ -1,295 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.tool; - -import android.content.ContentProviderOperation; -import android.content.ContentProviderResult; -import android.content.ContentResolver; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.OperationApplicationException; -import android.database.Cursor; -import android.os.RemoteException; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.CallNote; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute; - -import java.util.ArrayList; -import java.util.HashSet; - - -public class DataUtils { - public static final String TAG = "DataUtils"; - public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) { - if (ids == null) { - Log.d(TAG, "the ids is null"); - return true; - } - if (ids.size() == 0) { - Log.d(TAG, "no id is in the hashset"); - return true; - } - - ArrayList operationList = new ArrayList(); - for (long id : ids) { - if(id == Notes.ID_ROOT_FOLDER) { - Log.e(TAG, "Don't delete system folder root"); - continue; - } - ContentProviderOperation.Builder builder = ContentProviderOperation - .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); - operationList.add(builder.build()); - } - try { - ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); - if (results == null || results.length == 0 || results[0] == null) { - Log.d(TAG, "delete notes failed, ids:" + ids.toString()); - return false; - } - return true; - } catch (RemoteException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - } catch (OperationApplicationException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - } - return false; - } - - public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) { - ContentValues values = new ContentValues(); - values.put(NoteColumns.PARENT_ID, desFolderId); - values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId); - values.put(NoteColumns.LOCAL_MODIFIED, 1); - resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null); - } - - public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids, - long folderId) { - if (ids == null) { - Log.d(TAG, "the ids is null"); - return true; - } - - ArrayList operationList = new ArrayList(); - for (long id : ids) { - ContentProviderOperation.Builder builder = ContentProviderOperation - .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); - builder.withValue(NoteColumns.PARENT_ID, folderId); - builder.withValue(NoteColumns.LOCAL_MODIFIED, 1); - operationList.add(builder.build()); - } - - try { - ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); - if (results == null || results.length == 0 || results[0] == null) { - Log.d(TAG, "delete notes failed, ids:" + ids.toString()); - return false; - } - return true; - } catch (RemoteException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - } catch (OperationApplicationException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - } - return false; - } - - /** - * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}} - */ - public static int getUserFolderCount(ContentResolver resolver) { - Cursor cursor =resolver.query(Notes.CONTENT_NOTE_URI, - new String[] { "COUNT(*)" }, - NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?", - new String[] { String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)}, - null); - - int count = 0; - if(cursor != null) { - if(cursor.moveToFirst()) { - try { - count = cursor.getInt(0); - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, "get folder count failed:" + e.toString()); - } finally { - cursor.close(); - } - } - } - return count; - } - - public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) { - Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), - null, - NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER, - new String [] {String.valueOf(type)}, - null); - - boolean exist = false; - if (cursor != null) { - if (cursor.getCount() > 0) { - exist = true; - } - cursor.close(); - } - return exist; - } - - public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) { - Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), - null, null, null, null); - - boolean exist = false; - if (cursor != null) { - if (cursor.getCount() > 0) { - exist = true; - } - cursor.close(); - } - return exist; - } - - public static boolean existInDataDatabase(ContentResolver resolver, long dataId) { - Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), - null, null, null, null); - - boolean exist = false; - if (cursor != null) { - if (cursor.getCount() > 0) { - exist = true; - } - cursor.close(); - } - return exist; - } - - public static boolean checkVisibleFolderName(ContentResolver resolver, String name) { - Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null, - NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + - " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + - " AND " + NoteColumns.SNIPPET + "=?", - new String[] { name }, null); - boolean exist = false; - if(cursor != null) { - if(cursor.getCount() > 0) { - exist = true; - } - cursor.close(); - } - return exist; - } - - public static HashSet getFolderNoteWidget(ContentResolver resolver, long folderId) { - Cursor c = resolver.query(Notes.CONTENT_NOTE_URI, - new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE }, - NoteColumns.PARENT_ID + "=?", - new String[] { String.valueOf(folderId) }, - null); - - HashSet set = null; - if (c != null) { - if (c.moveToFirst()) { - set = new HashSet(); - do { - try { - AppWidgetAttribute widget = new AppWidgetAttribute(); - widget.widgetId = c.getInt(0); - widget.widgetType = c.getInt(1); - set.add(widget); - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, e.toString()); - } - } while (c.moveToNext()); - } - c.close(); - } - return set; - } - - public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) { - Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, - new String [] { CallNote.PHONE_NUMBER }, - CallNote.NOTE_ID + "=? AND " + CallNote.MIME_TYPE + "=?", - new String [] { String.valueOf(noteId), CallNote.CONTENT_ITEM_TYPE }, - null); - - if (cursor != null && cursor.moveToFirst()) { - try { - return cursor.getString(0); - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, "Get call number fails " + e.toString()); - } finally { - cursor.close(); - } - } - return ""; - } - - public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) { - Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, - new String [] { CallNote.NOTE_ID }, - CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL(" - + CallNote.PHONE_NUMBER + ",?)", - new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber }, - null); - - if (cursor != null) { - if (cursor.moveToFirst()) { - try { - return cursor.getLong(0); - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, "Get call note id fails " + e.toString()); - } - } - cursor.close(); - } - return 0; - } - - public static String getSnippetById(ContentResolver resolver, long noteId) { - Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, - new String [] { NoteColumns.SNIPPET }, - NoteColumns.ID + "=?", - new String [] { String.valueOf(noteId)}, - null); - - if (cursor != null) { - String snippet = ""; - if (cursor.moveToFirst()) { - snippet = cursor.getString(0); - } - cursor.close(); - return snippet; - } - throw new IllegalArgumentException("Note is not found with id: " + noteId); - } - - public static String getFormattedSnippet(String snippet) { - if (snippet != null) { - snippet = snippet.trim(); - int index = snippet.indexOf('\n'); - if (index != -1) { - snippet = snippet.substring(0, index); - } - } - return snippet; - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java deleted file mode 100644 index 666b729..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.tool; - -public class GTaskStringUtils { - - public final static String GTASK_JSON_ACTION_ID = "action_id"; - - public final static String GTASK_JSON_ACTION_LIST = "action_list"; - - public final static String GTASK_JSON_ACTION_TYPE = "action_type"; - - public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create"; - - public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all"; - - public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move"; - - public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update"; - - public final static String GTASK_JSON_CREATOR_ID = "creator_id"; - - public final static String GTASK_JSON_CHILD_ENTITY = "child_entity"; - - public final static String GTASK_JSON_CLIENT_VERSION = "client_version"; - - public final static String GTASK_JSON_COMPLETED = "completed"; - - public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id"; - - public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id"; - - public final static String GTASK_JSON_DELETED = "deleted"; - - public final static String GTASK_JSON_DEST_LIST = "dest_list"; - - public final static String GTASK_JSON_DEST_PARENT = "dest_parent"; - - public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type"; - - public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta"; - - public final static String GTASK_JSON_ENTITY_TYPE = "entity_type"; - - public final static String GTASK_JSON_GET_DELETED = "get_deleted"; - - public final static String GTASK_JSON_ID = "id"; - - public final static String GTASK_JSON_INDEX = "index"; - - public final static String GTASK_JSON_LAST_MODIFIED = "last_modified"; - - public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point"; - - public final static String GTASK_JSON_LIST_ID = "list_id"; - - public final static String GTASK_JSON_LISTS = "lists"; - - public final static String GTASK_JSON_NAME = "name"; - - public final static String GTASK_JSON_NEW_ID = "new_id"; - - public final static String GTASK_JSON_NOTES = "notes"; - - public final static String GTASK_JSON_PARENT_ID = "parent_id"; - - public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id"; - - public final static String GTASK_JSON_RESULTS = "results"; - - public final static String GTASK_JSON_SOURCE_LIST = "source_list"; - - public final static String GTASK_JSON_TASKS = "tasks"; - - public final static String GTASK_JSON_TYPE = "type"; - - public final static String GTASK_JSON_TYPE_GROUP = "GROUP"; - - public final static String GTASK_JSON_TYPE_TASK = "TASK"; - - public final static String GTASK_JSON_USER = "user"; - - public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]"; - - public final static String FOLDER_DEFAULT = "Default"; - - public final static String FOLDER_CALL_NOTE = "Call_Note"; - - public final static String FOLDER_META = "METADATA"; - - public final static String META_HEAD_GTASK_ID = "meta_gid"; - - public final static String META_HEAD_NOTE = "meta_note"; - - public final static String META_HEAD_DATA = "meta_data"; - - public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE"; - -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java deleted file mode 100644 index 1ad3ad6..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.tool; - -import android.content.Context; -import android.preference.PreferenceManager; - -import net.micode.notes.R; -import net.micode.notes.ui.NotesPreferenceActivity; - -public class ResourceParser { - - public static final int YELLOW = 0; - public static final int BLUE = 1; - public static final int WHITE = 2; - public static final int GREEN = 3; - public static final int RED = 4; - - public static final int BG_DEFAULT_COLOR = YELLOW; - - public static final int TEXT_SMALL = 0; - public static final int TEXT_MEDIUM = 1; - public static final int TEXT_LARGE = 2; - public static final int TEXT_SUPER = 3; - - public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM; - - public static class NoteBgResources { - private final static int [] BG_EDIT_RESOURCES = new int [] { - R.drawable.edit_yellow, - R.drawable.edit_blue, - R.drawable.edit_white, - R.drawable.edit_green, - R.drawable.edit_red - }; - - private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] { - R.drawable.edit_title_yellow, - R.drawable.edit_title_blue, - R.drawable.edit_title_white, - R.drawable.edit_title_green, - R.drawable.edit_title_red - }; - - public static int getNoteBgResource(int id) { - return BG_EDIT_RESOURCES[id]; - } - - public static int getNoteTitleBgResource(int id) { - return BG_EDIT_TITLE_RESOURCES[id]; - } - } - - public static int getDefaultBgId(Context context) { - if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean( - NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) { - return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length); - } else { - return BG_DEFAULT_COLOR; - } - } - - public static class NoteItemBgResources { - private final static int [] BG_FIRST_RESOURCES = new int [] { - R.drawable.list_yellow_up, - R.drawable.list_blue_up, - R.drawable.list_white_up, - R.drawable.list_green_up, - R.drawable.list_red_up - }; - - private final static int [] BG_NORMAL_RESOURCES = new int [] { - R.drawable.list_yellow_middle, - R.drawable.list_blue_middle, - R.drawable.list_white_middle, - R.drawable.list_green_middle, - R.drawable.list_red_middle - }; - - private final static int [] BG_LAST_RESOURCES = new int [] { - R.drawable.list_yellow_down, - R.drawable.list_blue_down, - R.drawable.list_white_down, - R.drawable.list_green_down, - R.drawable.list_red_down, - }; - - private final static int [] BG_SINGLE_RESOURCES = new int [] { - R.drawable.list_yellow_single, - R.drawable.list_blue_single, - R.drawable.list_white_single, - R.drawable.list_green_single, - R.drawable.list_red_single - }; - - public static int getNoteBgFirstRes(int id) { - return BG_FIRST_RESOURCES[id]; - } - - public static int getNoteBgLastRes(int id) { - return BG_LAST_RESOURCES[id]; - } - - public static int getNoteBgSingleRes(int id) { - return BG_SINGLE_RESOURCES[id]; - } - - public static int getNoteBgNormalRes(int id) { - return BG_NORMAL_RESOURCES[id]; - } - - public static int getFolderBgRes() { - return R.drawable.list_folder; - } - } - - public static class WidgetBgResources { - private final static int [] BG_2X_RESOURCES = new int [] { - R.drawable.widget_2x_yellow, - R.drawable.widget_2x_blue, - R.drawable.widget_2x_white, - R.drawable.widget_2x_green, - R.drawable.widget_2x_red, - }; - - public static int getWidget2xBgResource(int id) { - return BG_2X_RESOURCES[id]; - } - - private final static int [] BG_4X_RESOURCES = new int [] { - R.drawable.widget_4x_yellow, - R.drawable.widget_4x_blue, - R.drawable.widget_4x_white, - R.drawable.widget_4x_green, - R.drawable.widget_4x_red - }; - - public static int getWidget4xBgResource(int id) { - return BG_4X_RESOURCES[id]; - } - } - - public static class TextAppearanceResources { - private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] { - R.style.TextAppearanceNormal, - R.style.TextAppearanceMedium, - R.style.TextAppearanceLarge, - R.style.TextAppearanceSuper - }; - - public static int getTexAppearanceResource(int id) { - /** - * HACKME: Fix bug of store the resource id in shared preference. - * The id may larger than the length of resources, in this case, - * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE} - */ - if (id >= TEXTAPPEARANCE_RESOURCES.length) { - return BG_DEFAULT_FONT_SIZE; - } - return TEXTAPPEARANCE_RESOURCES[id]; - } - - public static int getResourcesSize() { - return TEXTAPPEARANCE_RESOURCES.length; - } - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java deleted file mode 100644 index 85723be..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; -import android.content.DialogInterface.OnDismissListener; -import android.content.Intent; -import android.media.AudioManager; -import android.media.MediaPlayer; -import android.media.RingtoneManager; -import android.net.Uri; -import android.os.Bundle; -import android.os.PowerManager; -import android.provider.Settings; -import android.view.Window; -import android.view.WindowManager; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.tool.DataUtils; - -import java.io.IOException; - - -public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener { - private long mNoteId; - private String mSnippet; - private static final int SNIPPET_PREW_MAX_LEN = 60; - MediaPlayer mPlayer; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_NO_TITLE); - - final Window win = getWindow(); - win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); - - if (!isScreenOn()) { - win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON - | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON - | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON - | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); - } - - Intent intent = getIntent(); - - try { - mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); - mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId); - mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0, - SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info) - : mSnippet; - } catch (IllegalArgumentException e) { - e.printStackTrace(); - return; - } - - mPlayer = new MediaPlayer(); - if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { - showActionDialog(); - playAlarmSound(); - } else { - finish(); - } - } - - private boolean isScreenOn() { - PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); - return pm.isScreenOn(); - } - - private void playAlarmSound() { - Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); - - int silentModeStreams = Settings.System.getInt(getContentResolver(), - Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); - - if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) { - mPlayer.setAudioStreamType(silentModeStreams); - } else { - mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM); - } - try { - mPlayer.setDataSource(this, url); - mPlayer.prepare(); - mPlayer.setLooping(true); - mPlayer.start(); - } catch (IllegalArgumentException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (SecurityException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IllegalStateException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - private void showActionDialog() { - AlertDialog.Builder dialog = new AlertDialog.Builder(this); - dialog.setTitle(R.string.app_name); - dialog.setMessage(mSnippet); - dialog.setPositiveButton(R.string.notealert_ok, this); - if (isScreenOn()) { - dialog.setNegativeButton(R.string.notealert_enter, this); - } - dialog.show().setOnDismissListener(this); - } - - public void onClick(DialogInterface dialog, int which) { - switch (which) { - case DialogInterface.BUTTON_NEGATIVE: - Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_VIEW); - intent.putExtra(Intent.EXTRA_UID, mNoteId); - startActivity(intent); - break; - default: - break; - } - } - - public void onDismiss(DialogInterface dialog) { - stopAlarmSound(); - finish(); - } - - private void stopAlarmSound() { - if (mPlayer != null) { - mPlayer.stop(); - mPlayer.release(); - mPlayer = null; - } - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java deleted file mode 100644 index f221202..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.app.AlarmManager; -import android.app.PendingIntent; -import android.content.BroadcastReceiver; -import android.content.ContentUris; -import android.content.Context; -import android.content.Intent; -import android.database.Cursor; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; - - -public class AlarmInitReceiver extends BroadcastReceiver { - - private static final String [] PROJECTION = new String [] { - NoteColumns.ID, - NoteColumns.ALERTED_DATE - }; - - private static final int COLUMN_ID = 0; - private static final int COLUMN_ALERTED_DATE = 1; - - @Override - public void onReceive(Context context, Intent intent) { - long currentDate = System.currentTimeMillis(); - Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI, - PROJECTION, - NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE, - new String[] { String.valueOf(currentDate) }, - null); - - if (c != null) { - if (c.moveToFirst()) { - do { - long alertDate = c.getLong(COLUMN_ALERTED_DATE); - Intent sender = new Intent(context, AlarmReceiver.class); - sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID))); - PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0); - AlarmManager alermManager = (AlarmManager) context - .getSystemService(Context.ALARM_SERVICE); - alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); - } while (c.moveToNext()); - } - c.close(); - } - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java deleted file mode 100644 index 54e503b..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -public class AlarmReceiver extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - intent.setClass(context, AlarmAlertActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java deleted file mode 100644 index 496b0cd..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java +++ /dev/null @@ -1,485 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import java.text.DateFormatSymbols; -import java.util.Calendar; - -import net.micode.notes.R; - - -import android.content.Context; -import android.text.format.DateFormat; -import android.view.View; -import android.widget.FrameLayout; -import android.widget.NumberPicker; - -public class DateTimePicker extends FrameLayout { - - private static final boolean DEFAULT_ENABLE_STATE = true; - - private static final int HOURS_IN_HALF_DAY = 12; - private static final int HOURS_IN_ALL_DAY = 24; - private static final int DAYS_IN_ALL_WEEK = 7; - private static final int DATE_SPINNER_MIN_VAL = 0; - private static final int DATE_SPINNER_MAX_VAL = DAYS_IN_ALL_WEEK - 1; - private static final int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW = 0; - private static final int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW = 23; - private static final int HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW = 1; - private static final int HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW = 12; - private static final int MINUT_SPINNER_MIN_VAL = 0; - private static final int MINUT_SPINNER_MAX_VAL = 59; - private static final int AMPM_SPINNER_MIN_VAL = 0; - private static final int AMPM_SPINNER_MAX_VAL = 1; - - private final NumberPicker mDateSpinner; - private final NumberPicker mHourSpinner; - private final NumberPicker mMinuteSpinner; - private final NumberPicker mAmPmSpinner; - private Calendar mDate; - - private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; - - private boolean mIsAm; - - private boolean mIs24HourView; - - private boolean mIsEnabled = DEFAULT_ENABLE_STATE; - - private boolean mInitialising; - - private OnDateTimeChangedListener mOnDateTimeChangedListener; - - private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal); - updateDateControl(); - onDateTimeChanged(); - } - }; - - private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - boolean isDateChanged = false; - Calendar cal = Calendar.getInstance(); - if (!mIs24HourView) { - if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) { - cal.setTimeInMillis(mDate.getTimeInMillis()); - cal.add(Calendar.DAY_OF_YEAR, 1); - isDateChanged = true; - } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { - cal.setTimeInMillis(mDate.getTimeInMillis()); - cal.add(Calendar.DAY_OF_YEAR, -1); - isDateChanged = true; - } - if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY || - oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { - mIsAm = !mIsAm; - updateAmPmControl(); - } - } else { - if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) { - cal.setTimeInMillis(mDate.getTimeInMillis()); - cal.add(Calendar.DAY_OF_YEAR, 1); - isDateChanged = true; - } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) { - cal.setTimeInMillis(mDate.getTimeInMillis()); - cal.add(Calendar.DAY_OF_YEAR, -1); - isDateChanged = true; - } - } - int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY); - mDate.set(Calendar.HOUR_OF_DAY, newHour); - onDateTimeChanged(); - if (isDateChanged) { - setCurrentYear(cal.get(Calendar.YEAR)); - setCurrentMonth(cal.get(Calendar.MONTH)); - setCurrentDay(cal.get(Calendar.DAY_OF_MONTH)); - } - } - }; - - private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - int minValue = mMinuteSpinner.getMinValue(); - int maxValue = mMinuteSpinner.getMaxValue(); - int offset = 0; - if (oldVal == maxValue && newVal == minValue) { - offset += 1; - } else if (oldVal == minValue && newVal == maxValue) { - offset -= 1; - } - if (offset != 0) { - mDate.add(Calendar.HOUR_OF_DAY, offset); - mHourSpinner.setValue(getCurrentHour()); - updateDateControl(); - int newHour = getCurrentHourOfDay(); - if (newHour >= HOURS_IN_HALF_DAY) { - mIsAm = false; - updateAmPmControl(); - } else { - mIsAm = true; - updateAmPmControl(); - } - } - mDate.set(Calendar.MINUTE, newVal); - onDateTimeChanged(); - } - }; - - private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - mIsAm = !mIsAm; - if (mIsAm) { - mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY); - } else { - mDate.add(Calendar.HOUR_OF_DAY, HOURS_IN_HALF_DAY); - } - updateAmPmControl(); - onDateTimeChanged(); - } - }; - - public interface OnDateTimeChangedListener { - void onDateTimeChanged(DateTimePicker view, int year, int month, - int dayOfMonth, int hourOfDay, int minute); - } - - public DateTimePicker(Context context) { - this(context, System.currentTimeMillis()); - } - - public DateTimePicker(Context context, long date) { - this(context, date, DateFormat.is24HourFormat(context)); - } - - public DateTimePicker(Context context, long date, boolean is24HourView) { - super(context); - mDate = Calendar.getInstance(); - mInitialising = true; - mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; - inflate(context, R.layout.datetime_picker, this); - - mDateSpinner = (NumberPicker) findViewById(R.id.date); - mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL); - mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL); - mDateSpinner.setOnValueChangedListener(mOnDateChangedListener); - - mHourSpinner = (NumberPicker) findViewById(R.id.hour); - mHourSpinner.setOnValueChangedListener(mOnHourChangedListener); - mMinuteSpinner = (NumberPicker) findViewById(R.id.minute); - mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL); - mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL); - mMinuteSpinner.setOnLongPressUpdateInterval(100); - mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener); - - String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings(); - mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm); - mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL); - mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL); - mAmPmSpinner.setDisplayedValues(stringsForAmPm); - mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener); - - // update controls to initial state - updateDateControl(); - updateHourControl(); - updateAmPmControl(); - - set24HourView(is24HourView); - - // set to current time - setCurrentDate(date); - - setEnabled(isEnabled()); - - // set the content descriptions - mInitialising = false; - } - - @Override - public void setEnabled(boolean enabled) { - if (mIsEnabled == enabled) { - return; - } - super.setEnabled(enabled); - mDateSpinner.setEnabled(enabled); - mMinuteSpinner.setEnabled(enabled); - mHourSpinner.setEnabled(enabled); - mAmPmSpinner.setEnabled(enabled); - mIsEnabled = enabled; - } - - @Override - public boolean isEnabled() { - return mIsEnabled; - } - - /** - * Get the current date in millis - * - * @return the current date in millis - */ - public long getCurrentDateInTimeMillis() { - return mDate.getTimeInMillis(); - } - - /** - * Set the current date - * - * @param date The current date in millis - */ - public void setCurrentDate(long date) { - Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(date); - setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), - cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)); - } - - /** - * Set the current date - * - * @param year The current year - * @param month The current month - * @param dayOfMonth The current dayOfMonth - * @param hourOfDay The current hourOfDay - * @param minute The current minute - */ - public void setCurrentDate(int year, int month, - int dayOfMonth, int hourOfDay, int minute) { - setCurrentYear(year); - setCurrentMonth(month); - setCurrentDay(dayOfMonth); - setCurrentHour(hourOfDay); - setCurrentMinute(minute); - } - - /** - * Get current year - * - * @return The current year - */ - public int getCurrentYear() { - return mDate.get(Calendar.YEAR); - } - - /** - * Set current year - * - * @param year The current year - */ - public void setCurrentYear(int year) { - if (!mInitialising && year == getCurrentYear()) { - return; - } - mDate.set(Calendar.YEAR, year); - updateDateControl(); - onDateTimeChanged(); - } - - /** - * Get current month in the year - * - * @return The current month in the year - */ - public int getCurrentMonth() { - return mDate.get(Calendar.MONTH); - } - - /** - * Set current month in the year - * - * @param month The month in the year - */ - public void setCurrentMonth(int month) { - if (!mInitialising && month == getCurrentMonth()) { - return; - } - mDate.set(Calendar.MONTH, month); - updateDateControl(); - onDateTimeChanged(); - } - - /** - * Get current day of the month - * - * @return The day of the month - */ - public int getCurrentDay() { - return mDate.get(Calendar.DAY_OF_MONTH); - } - - /** - * Set current day of the month - * - * @param dayOfMonth The day of the month - */ - public void setCurrentDay(int dayOfMonth) { - if (!mInitialising && dayOfMonth == getCurrentDay()) { - return; - } - mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); - updateDateControl(); - onDateTimeChanged(); - } - - /** - * Get current hour in 24 hour mode, in the range (0~23) - * @return The current hour in 24 hour mode - */ - public int getCurrentHourOfDay() { - return mDate.get(Calendar.HOUR_OF_DAY); - } - - private int getCurrentHour() { - if (mIs24HourView){ - return getCurrentHourOfDay(); - } else { - int hour = getCurrentHourOfDay(); - if (hour > HOURS_IN_HALF_DAY) { - return hour - HOURS_IN_HALF_DAY; - } else { - return hour == 0 ? HOURS_IN_HALF_DAY : hour; - } - } - } - - /** - * Set current hour in 24 hour mode, in the range (0~23) - * - * @param hourOfDay - */ - public void setCurrentHour(int hourOfDay) { - if (!mInitialising && hourOfDay == getCurrentHourOfDay()) { - return; - } - mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); - if (!mIs24HourView) { - if (hourOfDay >= HOURS_IN_HALF_DAY) { - mIsAm = false; - if (hourOfDay > HOURS_IN_HALF_DAY) { - hourOfDay -= HOURS_IN_HALF_DAY; - } - } else { - mIsAm = true; - if (hourOfDay == 0) { - hourOfDay = HOURS_IN_HALF_DAY; - } - } - updateAmPmControl(); - } - mHourSpinner.setValue(hourOfDay); - onDateTimeChanged(); - } - - /** - * Get currentMinute - * - * @return The Current Minute - */ - public int getCurrentMinute() { - return mDate.get(Calendar.MINUTE); - } - - /** - * Set current minute - */ - public void setCurrentMinute(int minute) { - if (!mInitialising && minute == getCurrentMinute()) { - return; - } - mMinuteSpinner.setValue(minute); - mDate.set(Calendar.MINUTE, minute); - onDateTimeChanged(); - } - - /** - * @return true if this is in 24 hour view else false. - */ - public boolean is24HourView () { - return mIs24HourView; - } - - /** - * Set whether in 24 hour or AM/PM mode. - * - * @param is24HourView True for 24 hour mode. False for AM/PM mode. - */ - public void set24HourView(boolean is24HourView) { - if (mIs24HourView == is24HourView) { - return; - } - mIs24HourView = is24HourView; - mAmPmSpinner.setVisibility(is24HourView ? View.GONE : View.VISIBLE); - int hour = getCurrentHourOfDay(); - updateHourControl(); - setCurrentHour(hour); - updateAmPmControl(); - } - - private void updateDateControl() { - Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(mDate.getTimeInMillis()); - cal.add(Calendar.DAY_OF_YEAR, -DAYS_IN_ALL_WEEK / 2 - 1); - mDateSpinner.setDisplayedValues(null); - for (int i = 0; i < DAYS_IN_ALL_WEEK; ++i) { - cal.add(Calendar.DAY_OF_YEAR, 1); - mDateDisplayValues[i] = (String) DateFormat.format("MM.dd EEEE", cal); - } - mDateSpinner.setDisplayedValues(mDateDisplayValues); - mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2); - mDateSpinner.invalidate(); - } - - private void updateAmPmControl() { - if (mIs24HourView) { - mAmPmSpinner.setVisibility(View.GONE); - } else { - int index = mIsAm ? Calendar.AM : Calendar.PM; - mAmPmSpinner.setValue(index); - mAmPmSpinner.setVisibility(View.VISIBLE); - } - } - - private void updateHourControl() { - if (mIs24HourView) { - mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW); - mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW); - } else { - mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW); - mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW); - } - } - - /** - * Set the callback that indicates the 'Set' button has been pressed. - * @param callback the callback, if null will do nothing - */ - public void setOnDateTimeChangedListener(OnDateTimeChangedListener callback) { - mOnDateTimeChangedListener = callback; - } - - private void onDateTimeChanged() { - if (mOnDateTimeChangedListener != null) { - mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(), - getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute()); - } - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java deleted file mode 100644 index 2c47ba4..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import java.util.Calendar; - -import net.micode.notes.R; -import net.micode.notes.ui.DateTimePicker; -import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; -import android.text.format.DateFormat; -import android.text.format.DateUtils; - -public class DateTimePickerDialog extends AlertDialog implements OnClickListener { - - private Calendar mDate = Calendar.getInstance(); - private boolean mIs24HourView; - private OnDateTimeSetListener mOnDateTimeSetListener; - private DateTimePicker mDateTimePicker; - - public interface OnDateTimeSetListener { - void OnDateTimeSet(AlertDialog dialog, long date); - } - - public DateTimePickerDialog(Context context, long date) { - super(context); - mDateTimePicker = new DateTimePicker(context); - setView(mDateTimePicker); - mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() { - public void onDateTimeChanged(DateTimePicker view, int year, int month, - int dayOfMonth, int hourOfDay, int minute) { - mDate.set(Calendar.YEAR, year); - mDate.set(Calendar.MONTH, month); - mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); - mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); - mDate.set(Calendar.MINUTE, minute); - updateTitle(mDate.getTimeInMillis()); - } - }); - mDate.setTimeInMillis(date); - mDate.set(Calendar.SECOND, 0); - mDateTimePicker.setCurrentDate(mDate.getTimeInMillis()); - setButton(context.getString(R.string.datetime_dialog_ok), this); - setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null); - set24HourView(DateFormat.is24HourFormat(this.getContext())); - updateTitle(mDate.getTimeInMillis()); - } - - public void set24HourView(boolean is24HourView) { - mIs24HourView = is24HourView; - } - - public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) { - mOnDateTimeSetListener = callBack; - } - - private void updateTitle(long date) { - int flag = - DateUtils.FORMAT_SHOW_YEAR | - DateUtils.FORMAT_SHOW_DATE | - DateUtils.FORMAT_SHOW_TIME; - flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; - setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); - } - - public void onClick(DialogInterface arg0, int arg1) { - if (mOnDateTimeSetListener != null) { - mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis()); - } - } - -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java deleted file mode 100644 index 613dc74..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.content.Context; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.PopupMenu; -import android.widget.PopupMenu.OnMenuItemClickListener; - -import net.micode.notes.R; - -public class DropdownMenu { - private Button mButton; - private PopupMenu mPopupMenu; - private Menu mMenu; - - public DropdownMenu(Context context, Button button, int menuId) { - mButton = button; - mButton.setBackgroundResource(R.drawable.dropdown_icon); - mPopupMenu = new PopupMenu(context, mButton); - mMenu = mPopupMenu.getMenu(); - mPopupMenu.getMenuInflater().inflate(menuId, mMenu); - mButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - mPopupMenu.show(); - } - }); - } - - public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) { - if (mPopupMenu != null) { - mPopupMenu.setOnMenuItemClickListener(listener); - } - } - - public MenuItem findItem(int id) { - return mMenu.findItem(id); - } - - public void setTitle(CharSequence title) { - mButton.setText(title); - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java deleted file mode 100644 index 96b77da..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.content.Context; -import android.database.Cursor; -import android.view.View; -import android.view.ViewGroup; -import android.widget.CursorAdapter; -import android.widget.LinearLayout; -import android.widget.TextView; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; - - -public class FoldersListAdapter extends CursorAdapter { - public static final String [] PROJECTION = { - NoteColumns.ID, - NoteColumns.SNIPPET - }; - - public static final int ID_COLUMN = 0; - public static final int NAME_COLUMN = 1; - - public FoldersListAdapter(Context context, Cursor c) { - super(context, c); - // TODO Auto-generated constructor stub - } - - @Override - public View newView(Context context, Cursor cursor, ViewGroup parent) { - return new FolderListItem(context); - } - - @Override - public void bindView(View view, Context context, Cursor cursor) { - if (view instanceof FolderListItem) { - String folderName = (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context - .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); - ((FolderListItem) view).bind(folderName); - } - } - - public String getFolderName(Context context, int position) { - Cursor cursor = (Cursor) getItem(position); - return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context - .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); - } - - private class FolderListItem extends LinearLayout { - private TextView mName; - - public FolderListItem(Context context) { - super(context); - inflate(context, R.layout.folder_list_item, this); - mName = (TextView) findViewById(R.id.tv_folder_name); - } - - public void bind(String name) { - mName.setText(name); - } - } - -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java deleted file mode 100644 index 96a9ff8..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ /dev/null @@ -1,873 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.app.Activity; -import android.app.AlarmManager; -import android.app.AlertDialog; -import android.app.PendingIntent; -import android.app.SearchManager; -import android.appwidget.AppWidgetManager; -import android.content.ContentUris; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.SharedPreferences; -import android.graphics.Paint; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.text.Spannable; -import android.text.SpannableString; -import android.text.TextUtils; -import android.text.format.DateUtils; -import android.text.style.BackgroundColorSpan; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; -import android.view.MotionEvent; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.WindowManager; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; -import android.widget.EditText; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; -import android.widget.Toast; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.TextNote; -import net.micode.notes.model.WorkingNote; -import net.micode.notes.model.WorkingNote.NoteSettingChangedListener; -import net.micode.notes.tool.DataUtils; -import net.micode.notes.tool.ResourceParser; -import net.micode.notes.tool.ResourceParser.TextAppearanceResources; -import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener; -import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; -import net.micode.notes.widget.NoteWidgetProvider_2x; -import net.micode.notes.widget.NoteWidgetProvider_4x; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - - -public class NoteEditActivity extends Activity implements OnClickListener, - NoteSettingChangedListener, OnTextViewChangeListener { - private class HeadViewHolder { - public TextView tvModified; - - public ImageView ivAlertIcon; - - public TextView tvAlertDate; - - public ImageView ibSetBgColor; - } - - private static final Map sBgSelectorBtnsMap = new HashMap(); - static { - sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); - sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED); - sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE); - sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN); - sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); - } - - private static final Map sBgSelectorSelectionMap = new HashMap(); - static { - sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select); - sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select); - sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select); - sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select); - sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); - } - - private static final Map sFontSizeBtnsMap = new HashMap(); - static { - sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE); - sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL); - sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM); - sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER); - } - - private static final Map sFontSelectorSelectionMap = new HashMap(); - static { - sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select); - sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select); - sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select); - sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select); - } - - private static final String TAG = "NoteEditActivity"; - - private HeadViewHolder mNoteHeaderHolder; - - private View mHeadViewPanel; - - private View mNoteBgColorSelector; - - private View mFontSizeSelector; - - private EditText mNoteEditor; - - private View mNoteEditorPanel; - - private WorkingNote mWorkingNote; - - private SharedPreferences mSharedPrefs; - private int mFontSizeId; - - private static final String PREFERENCE_FONT_SIZE = "pref_font_size"; - - private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; - - public static final String TAG_CHECKED = String.valueOf('\u221A'); - public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); - - private LinearLayout mEditTextList; - - private String mUserQuery; - private Pattern mPattern; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - this.setContentView(R.layout.note_edit); - - if (savedInstanceState == null && !initActivityState(getIntent())) { - finish(); - return; - } - initResources(); - } - - /** - * 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); - if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) { - Intent intent = new Intent(Intent.ACTION_VIEW); - intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID)); - if (!initActivityState(intent)) { - finish(); - return; - } - Log.d(TAG, "Restoring from killed activity"); - } - } - - private boolean initActivityState(Intent intent) { - /** - * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id, - * then jump to the NotesListActivity - */ - mWorkingNote = null; - if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) { - long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0); - mUserQuery = ""; - - /** - * Starting from the searched result - */ - if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) { - noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY)); - mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY); - } - - if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) { - Intent jump = new Intent(this, NotesListActivity.class); - startActivity(jump); - showToast(R.string.error_note_not_exist); - finish(); - return false; - } else { - mWorkingNote = WorkingNote.load(this, noteId); - if (mWorkingNote == null) { - Log.e(TAG, "load note failed with note id" + noteId); - finish(); - return false; - } - } - getWindow().setSoftInputMode( - WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN - | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); - } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { - // New note - long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); - int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, - AppWidgetManager.INVALID_APPWIDGET_ID); - int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, - Notes.TYPE_WIDGET_INVALIDE); - int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, - ResourceParser.getDefaultBgId(this)); - - // Parse call-record note - String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER); - long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0); - if (callDate != 0 && phoneNumber != null) { - if (TextUtils.isEmpty(phoneNumber)) { - Log.w(TAG, "The call record number is null"); - } - long noteId = 0; - if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(), - phoneNumber, callDate)) > 0) { - mWorkingNote = WorkingNote.load(this, noteId); - if (mWorkingNote == null) { - Log.e(TAG, "load call note failed with note id" + noteId); - finish(); - return false; - } - } else { - mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, - widgetType, bgResId); - mWorkingNote.convertToCallNote(phoneNumber, callDate); - } - } else { - mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, - bgResId); - } - - getWindow().setSoftInputMode( - WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE - | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); - } else { - Log.e(TAG, "Intent not specified action, should not support"); - finish(); - return false; - } - mWorkingNote.setOnSettingStatusChangedListener(this); - return true; - } - - @Override - protected void onResume() { - super.onResume(); - initNoteScreen(); - } - - private void initNoteScreen() { - mNoteEditor.setTextAppearance(this, TextAppearanceResources - .getTexAppearanceResource(mFontSizeId)); - if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - switchToListMode(mWorkingNote.getContent()); - } else { - mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); - mNoteEditor.setSelection(mNoteEditor.getText().length()); - } - for (Integer id : sBgSelectorSelectionMap.keySet()) { - findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE); - } - mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); - mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId()); - - mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this, - mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE - | 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(); - } - - private void showAlertHeader() { - if (mWorkingNote.hasClockAlert()) { - long time = System.currentTimeMillis(); - if (time > mWorkingNote.getAlertDate()) { - mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired); - } else { - mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString( - mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS)); - } - mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE); - mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE); - } else { - mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); - mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); - }; - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - initActivityState(intent); - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - /** - * For new note without note id, we should firstly save it to - * generate a id. If the editing note is not worth saving, there - * is no id which is equivalent to create new note - */ - if (!mWorkingNote.existInDatabase()) { - saveNote(); - } - outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId()); - Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState"); - } - - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - if (mNoteBgColorSelector.getVisibility() == View.VISIBLE - && !inRangeOfView(mNoteBgColorSelector, ev)) { - mNoteBgColorSelector.setVisibility(View.GONE); - return true; - } - - if (mFontSizeSelector.getVisibility() == View.VISIBLE - && !inRangeOfView(mFontSizeSelector, ev)) { - mFontSizeSelector.setVisibility(View.GONE); - return true; - } - return super.dispatchTouchEvent(ev); - } - - private boolean inRangeOfView(View view, MotionEvent ev) { - int []location = new int[2]; - view.getLocationOnScreen(location); - int x = location[0]; - int y = location[1]; - if (ev.getX() < x - || ev.getX() > (x + view.getWidth()) - || ev.getY() < y - || ev.getY() > (y + view.getHeight())) { - return false; - } - return true; - } - - private void initResources() { - mHeadViewPanel = findViewById(R.id.note_title); - mNoteHeaderHolder = new HeadViewHolder(); - mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); - mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon); - mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date); - mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color); - mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this); - mNoteEditor = (EditText) findViewById(R.id.note_edit_view); - mNoteEditorPanel = findViewById(R.id.sv_note_edit); - mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector); - for (int id : sBgSelectorBtnsMap.keySet()) { - ImageView iv = (ImageView) findViewById(id); - iv.setOnClickListener(this); - } - - mFontSizeSelector = findViewById(R.id.font_size_selector); - for (int id : sFontSizeBtnsMap.keySet()) { - View view = findViewById(id); - view.setOnClickListener(this); - }; - mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); - mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); - /** - * HACKME: Fix bug of store the resource id in shared preference. - * The id may larger than the length of resources, in this case, - * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE} - */ - if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) { - mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE; - } - mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); - } - - @Override - protected void onPause() { - super.onPause(); - if(saveNote()) { - Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length()); - } - clearSettingState(); - } - - private void updateWidget() { - Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); - if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) { - intent.setClass(this, NoteWidgetProvider_2x.class); - } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) { - intent.setClass(this, NoteWidgetProvider_4x.class); - } else { - Log.e(TAG, "Unspported widget type"); - return; - } - - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - mWorkingNote.getWidgetId() - }); - - sendBroadcast(intent); - setResult(RESULT_OK, intent); - } - - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.btn_set_bg_color) { - mNoteBgColorSelector.setVisibility(View.VISIBLE); - findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - - View.VISIBLE); - } else if (sBgSelectorBtnsMap.containsKey(id)) { - findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - View.GONE); - mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id)); - mNoteBgColorSelector.setVisibility(View.GONE); - } else if (sFontSizeBtnsMap.containsKey(id)) { - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE); - mFontSizeId = sFontSizeBtnsMap.get(id); - mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit(); - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - getWorkingText(); - switchToListMode(mWorkingNote.getContent()); - } else { - mNoteEditor.setTextAppearance(this, - TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); - } - mFontSizeSelector.setVisibility(View.GONE); - } - } - - @Override - public void onBackPressed() { - if(clearSettingState()) { - return; - } - - saveNote(); - super.onBackPressed(); - } - - private boolean clearSettingState() { - if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) { - mNoteBgColorSelector.setVisibility(View.GONE); - return true; - } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) { - mFontSizeSelector.setVisibility(View.GONE); - return true; - } - return false; - } - - public void onBackgroundColorChanged() { - findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - View.VISIBLE); - mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId()); - mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); - } - - @Override - public boolean onPrepareOptionsMenu(Menu menu) { - if (isFinishing()) { - return true; - } - clearSettingState(); - menu.clear(); - if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) { - getMenuInflater().inflate(R.menu.call_note_edit, menu); - } else { - getMenuInflater().inflate(R.menu.note_edit, menu); - } - if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode); - } else { - menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode); - } - if (mWorkingNote.hasClockAlert()) { - menu.findItem(R.id.menu_alert).setVisible(false); - } else { - menu.findItem(R.id.menu_delete_remind).setVisible(false); - } - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_new_note: - createNewNote(); - break; - case R.id.menu_delete: - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_note)); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - deleteCurrentNote(); - finish(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case R.id.menu_font_size: - mFontSizeSelector.setVisibility(View.VISIBLE); - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - break; - case R.id.menu_list_mode: - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? - TextNote.MODE_CHECK_LIST : 0); - break; - case R.id.menu_share: - getWorkingText(); - sendTo(this, mWorkingNote.getContent()); - break; - case R.id.menu_send_to_desktop: - sendToDesktop(); - break; - case R.id.menu_alert: - setReminder(); - break; - case R.id.menu_delete_remind: - mWorkingNote.setAlertDate(0, false); - break; - default: - break; - } - return true; - } - - private void setReminder() { - DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); - d.setOnDateTimeSetListener(new OnDateTimeSetListener() { - public void OnDateTimeSet(AlertDialog dialog, long date) { - mWorkingNote.setAlertDate(date , true); - } - }); - 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); - intent.setType("text/plain"); - context.startActivity(intent); - } - - private void createNewNote() { - // Firstly, save current editing notes - saveNote(); - - // For safety, start a new NoteEditActivity - finish(); - Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_INSERT_OR_EDIT); - intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId()); - startActivity(intent); - } - - private void deleteCurrentNote() { - if (mWorkingNote.existInDatabase()) { - HashSet ids = new HashSet(); - long id = mWorkingNote.getNoteId(); - if (id != Notes.ID_ROOT_FOLDER) { - ids.add(id); - } else { - Log.d(TAG, "Wrong note id, should not happen"); - } - if (!isSyncMode()) { - if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { - Log.e(TAG, "Delete Note error"); - } - } else { - if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { - Log.e(TAG, "Move notes to trash folder error, should not happens"); - } - } - } - mWorkingNote.markDeleted(true); - } - - private boolean isSyncMode() { - return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; - } - - public void onClockAlertChanged(long date, boolean set) { - /** - * User could set clock to an unsaved note, so before setting the - * alert clock, we should save the note first - */ - if (!mWorkingNote.existInDatabase()) { - saveNote(); - } - if (mWorkingNote.getNoteId() > 0) { - Intent intent = new Intent(this, AlarmReceiver.class); - intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId())); - PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); - AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); - showAlertHeader(); - if(!set) { - alarmManager.cancel(pendingIntent); - } else { - alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); - } - } else { - /** - * There is the condition that user has input nothing (the note is - * not worthy saving), we have no note id, remind the user that he - * should input something - */ - Log.e(TAG, "Clock alert setting error"); - showToast(R.string.error_note_empty_for_clock); - } - } - - public void onWidgetChanged() { - updateWidget(); - } - - public void onEditTextDelete(int index, String text) { - int childCount = mEditTextList.getChildCount(); - if (childCount == 1) { - return; - } - - for (int i = index + 1; i < childCount; i++) { - ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) - .setIndex(i - 1); - } - - mEditTextList.removeViewAt(index); - NoteEditText edit = null; - if(index == 0) { - edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById( - R.id.et_edit_text); - } else { - edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById( - R.id.et_edit_text); - } - int length = edit.length(); - edit.append(text); - edit.requestFocus(); - edit.setSelection(length); - } - - public void onEditTextEnter(int index, String text) { - /** - * Should not happen, check for debug - */ - if(index > mEditTextList.getChildCount()) { - Log.e(TAG, "Index out of mEditTextList boundrary, should not happen"); - } - - View view = getListItem(text, index); - mEditTextList.addView(view, index); - NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - edit.requestFocus(); - edit.setSelection(0); - for (int i = index + 1; i < mEditTextList.getChildCount(); i++) { - ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) - .setIndex(i); - } - } - - private void switchToListMode(String text) { - mEditTextList.removeAllViews(); - String[] items = text.split("\n"); - int index = 0; - for (String item : items) { - if(!TextUtils.isEmpty(item)) { - mEditTextList.addView(getListItem(item, index)); - index++; - } - } - mEditTextList.addView(getListItem("", index)); - mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus(); - - mNoteEditor.setVisibility(View.GONE); - mEditTextList.setVisibility(View.VISIBLE); - } - - private Spannable getHighlightQueryResult(String fullText, String userQuery) { - SpannableString spannable = new SpannableString(fullText == null ? "" : fullText); - if (!TextUtils.isEmpty(userQuery)) { - mPattern = Pattern.compile(userQuery); - Matcher m = mPattern.matcher(fullText); - int start = 0; - while (m.find(start)) { - spannable.setSpan( - new BackgroundColorSpan(this.getResources().getColor( - R.color.user_query_highlight)), m.start(), m.end(), - Spannable.SPAN_INCLUSIVE_EXCLUSIVE); - start = m.end(); - } - } - return spannable; - } - - private View getListItem(String item, int index) { - View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); - final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); - CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item)); - cb.setOnCheckedChangeListener(new OnCheckedChangeListener() { - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) { - edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); - } else { - edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - } - } - }); - - if (item.startsWith(TAG_CHECKED)) { - cb.setChecked(true); - edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); - item = item.substring(TAG_CHECKED.length(), item.length()).trim(); - } else if (item.startsWith(TAG_UNCHECKED)) { - cb.setChecked(false); - edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - item = item.substring(TAG_UNCHECKED.length(), item.length()).trim(); - } - - edit.setOnTextViewChangeListener(this); - edit.setIndex(index); - edit.setText(getHighlightQueryResult(item, mUserQuery)); - return view; - } - - public void onTextChange(int index, boolean hasText) { - if (index >= mEditTextList.getChildCount()) { - Log.e(TAG, "Wrong index, should not happen"); - return; - } - if(hasText) { - mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE); - } else { - mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE); - } - } - - public void onCheckListModeChanged(int oldMode, int newMode) { - if (newMode == TextNote.MODE_CHECK_LIST) { - switchToListMode(mNoteEditor.getText().toString()); - } else { - if (!getWorkingText()) { - mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", - "")); - } - mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); - mEditTextList.setVisibility(View.GONE); - mNoteEditor.setVisibility(View.VISIBLE); - } - } - - private boolean getWorkingText() { - boolean hasChecked = false; - if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < mEditTextList.getChildCount(); i++) { - View view = mEditTextList.getChildAt(i); - NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - if (!TextUtils.isEmpty(edit.getText())) { - if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) { - sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n"); - hasChecked = true; - } else { - sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n"); - } - } - } - mWorkingNote.setWorkingText(sb.toString()); - } else { - mWorkingNote.setWorkingText(mNoteEditor.getText().toString()); - } - return hasChecked; - } - - private boolean saveNote() { - getWorkingText(); - boolean saved = mWorkingNote.saveNote(); - if (saved) { - /** - * There are two modes from List view to edit view, open one note, - * create/edit a node. Opening node requires to the original - * position in the list when back from edit view, while creating a - * new node requires to the top of the list. This code - * {@link #RESULT_OK} is used to identify the create/edit state - */ - setResult(RESULT_OK); - } - return saved; - } - - private void sendToDesktop() { - /** - * Before send message to home, we should make sure that current - * editing note is exists in databases. So, for new note, firstly - * save it - */ - if (!mWorkingNote.existInDatabase()) { - saveNote(); - } - - if (mWorkingNote.getNoteId() > 0) { - Intent sender = new Intent(); - Intent shortcutIntent = new Intent(this, NoteEditActivity.class); - shortcutIntent.setAction(Intent.ACTION_VIEW); - shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); - sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); - sender.putExtra(Intent.EXTRA_SHORTCUT_NAME, - makeShortcutIconTitle(mWorkingNote.getContent())); - sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, - Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app)); - sender.putExtra("duplicate", true); - sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); - showToast(R.string.info_note_enter_desktop); - sendBroadcast(sender); - } else { - /** - * There is the condition that user has input nothing (the note is - * not worthy saving), we have no note id, remind the user that he - * should input something - */ - Log.e(TAG, "Send to desktop error"); - showToast(R.string.error_note_empty_for_send_to_desktop); - } - } - - private String makeShortcutIconTitle(String content) { - content = content.replace(TAG_CHECKED, ""); - content = content.replace(TAG_UNCHECKED, ""); - return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0, - SHORTCUT_ICON_TITLE_MAX_LEN) : content; - } - - private void showToast(int resId) { - showToast(resId, Toast.LENGTH_SHORT); - } - - private void showToast(int resId, int duration) { - Toast.makeText(this, resId, duration).show(); - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java deleted file mode 100644 index 2afe2a8..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.content.Context; -import android.graphics.Rect; -import android.text.Layout; -import android.text.Selection; -import android.text.Spanned; -import android.text.TextUtils; -import android.text.style.URLSpan; -import android.util.AttributeSet; -import android.util.Log; -import android.view.ContextMenu; -import android.view.KeyEvent; -import android.view.MenuItem; -import android.view.MenuItem.OnMenuItemClickListener; -import android.view.MotionEvent; -import android.widget.EditText; - -import net.micode.notes.R; - -import java.util.HashMap; -import java.util.Map; - -public class NoteEditText extends EditText { - private static final String TAG = "NoteEditText"; - private int mIndex; - private int mSelectionStartBeforeDelete; - - private static final String SCHEME_TEL = "tel:" ; - private static final String SCHEME_HTTP = "http:" ; - private static final String SCHEME_EMAIL = "mailto:" ; - - private static final Map sSchemaActionResMap = new HashMap(); - static { - sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel); - sSchemaActionResMap.put(SCHEME_HTTP, R.string.note_link_web); - sSchemaActionResMap.put(SCHEME_EMAIL, R.string.note_link_email); - } - - /** - * Call by the {@link NoteEditActivity} to delete or add edit text - */ - public interface OnTextViewChangeListener { - /** - * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens - * and the text is null - */ - void onEditTextDelete(int index, String text); - - /** - * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER} - * happen - */ - void onEditTextEnter(int index, String text); - - /** - * Hide or show item option when text change - */ - void onTextChange(int index, boolean hasText); - } - - private OnTextViewChangeListener mOnTextViewChangeListener; - - public NoteEditText(Context context) { - super(context, null); - mIndex = 0; - } - - public void setIndex(int index) { - mIndex = index; - } - - public void setOnTextViewChangeListener(OnTextViewChangeListener listener) { - mOnTextViewChangeListener = listener; - } - - public NoteEditText(Context context, AttributeSet attrs) { - super(context, attrs, android.R.attr.editTextStyle); - } - - public NoteEditText(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - // TODO Auto-generated constructor stub - } - - @Override - public boolean onTouchEvent(MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - - int x = (int) event.getX(); - int y = (int) event.getY(); - x -= getTotalPaddingLeft(); - y -= getTotalPaddingTop(); - x += getScrollX(); - y += getScrollY(); - - Layout layout = getLayout(); - int line = layout.getLineForVertical(y); - int off = layout.getOffsetForHorizontal(line, x); - Selection.setSelection(getText(), off); - break; - } - - return super.onTouchEvent(event); - } - - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - switch (keyCode) { - case KeyEvent.KEYCODE_ENTER: - if (mOnTextViewChangeListener != null) { - return false; - } - break; - case KeyEvent.KEYCODE_DEL: - mSelectionStartBeforeDelete = getSelectionStart(); - break; - default: - break; - } - return super.onKeyDown(keyCode, event); - } - - @Override - public boolean onKeyUp(int keyCode, KeyEvent event) { - switch(keyCode) { - case KeyEvent.KEYCODE_DEL: - if (mOnTextViewChangeListener != null) { - if (0 == mSelectionStartBeforeDelete && mIndex != 0) { - mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString()); - return true; - } - } else { - Log.d(TAG, "OnTextViewChangeListener was not seted"); - } - break; - case KeyEvent.KEYCODE_ENTER: - if (mOnTextViewChangeListener != null) { - int selectionStart = getSelectionStart(); - String text = getText().subSequence(selectionStart, length()).toString(); - setText(getText().subSequence(0, selectionStart)); - mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text); - } else { - Log.d(TAG, "OnTextViewChangeListener was not seted"); - } - break; - default: - break; - } - return super.onKeyUp(keyCode, event); - } - - @Override - protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) { - if (mOnTextViewChangeListener != null) { - if (!focused && TextUtils.isEmpty(getText())) { - mOnTextViewChangeListener.onTextChange(mIndex, false); - } else { - mOnTextViewChangeListener.onTextChange(mIndex, true); - } - } - super.onFocusChanged(focused, direction, previouslyFocusedRect); - } - - @Override - protected void onCreateContextMenu(ContextMenu menu) { - if (getText() instanceof Spanned) { - int selStart = getSelectionStart(); - int selEnd = getSelectionEnd(); - - int min = Math.min(selStart, selEnd); - int max = Math.max(selStart, selEnd); - - final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class); - if (urls.length == 1) { - int defaultResId = 0; - for(String schema: sSchemaActionResMap.keySet()) { - if(urls[0].getURL().indexOf(schema) >= 0) { - defaultResId = sSchemaActionResMap.get(schema); - break; - } - } - - if (defaultResId == 0) { - defaultResId = R.string.note_link_other; - } - - menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener( - new OnMenuItemClickListener() { - public boolean onMenuItemClick(MenuItem item) { - // goto a new intent - urls[0].onClick(NoteEditText.this); - return true; - } - }); - } - } - super.onCreateContextMenu(menu); - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java deleted file mode 100644 index 0f5a878..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ /dev/null @@ -1,224 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.content.Context; -import android.database.Cursor; -import android.text.TextUtils; - -import net.micode.notes.data.Contact; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.tool.DataUtils; - - -public class NoteItemData { - static final String [] PROJECTION = new String [] { - NoteColumns.ID, - NoteColumns.ALERTED_DATE, - NoteColumns.BG_COLOR_ID, - NoteColumns.CREATED_DATE, - NoteColumns.HAS_ATTACHMENT, - NoteColumns.MODIFIED_DATE, - NoteColumns.NOTES_COUNT, - NoteColumns.PARENT_ID, - NoteColumns.SNIPPET, - NoteColumns.TYPE, - NoteColumns.WIDGET_ID, - NoteColumns.WIDGET_TYPE, - }; - - private static final int ID_COLUMN = 0; - private static final int ALERTED_DATE_COLUMN = 1; - private static final int BG_COLOR_ID_COLUMN = 2; - private static final int CREATED_DATE_COLUMN = 3; - private static final int HAS_ATTACHMENT_COLUMN = 4; - private static final int MODIFIED_DATE_COLUMN = 5; - private static final int NOTES_COUNT_COLUMN = 6; - private static final int PARENT_ID_COLUMN = 7; - private static final int SNIPPET_COLUMN = 8; - private static final int TYPE_COLUMN = 9; - private static final int WIDGET_ID_COLUMN = 10; - private static final int WIDGET_TYPE_COLUMN = 11; - - private long mId; - private long mAlertDate; - private int mBgColorId; - private long mCreatedDate; - private boolean mHasAttachment; - private long mModifiedDate; - private int mNotesCount; - private long mParentId; - private String mSnippet; - private int mType; - private int mWidgetId; - private int mWidgetType; - private String mName; - private String mPhoneNumber; - - private boolean mIsLastItem; - private boolean mIsFirstItem; - private boolean mIsOnlyOneItem; - private boolean mIsOneNoteFollowingFolder; - private boolean mIsMultiNotesFollowingFolder; - - public NoteItemData(Context context, Cursor cursor) { - mId = cursor.getLong(ID_COLUMN); - mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN); - mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN); - mCreatedDate = cursor.getLong(CREATED_DATE_COLUMN); - mHasAttachment = (cursor.getInt(HAS_ATTACHMENT_COLUMN) > 0) ? true : false; - mModifiedDate = cursor.getLong(MODIFIED_DATE_COLUMN); - mNotesCount = cursor.getInt(NOTES_COUNT_COLUMN); - mParentId = cursor.getLong(PARENT_ID_COLUMN); - mSnippet = cursor.getString(SNIPPET_COLUMN); - mSnippet = mSnippet.replace(NoteEditActivity.TAG_CHECKED, "").replace( - NoteEditActivity.TAG_UNCHECKED, ""); - mType = cursor.getInt(TYPE_COLUMN); - mWidgetId = cursor.getInt(WIDGET_ID_COLUMN); - mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); - - mPhoneNumber = ""; - if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { - mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId); - if (!TextUtils.isEmpty(mPhoneNumber)) { - mName = Contact.getContact(context, mPhoneNumber); - if (mName == null) { - mName = mPhoneNumber; - } - } - } - - if (mName == null) { - mName = ""; - } - checkPostion(cursor); - } - - private void checkPostion(Cursor cursor) { - mIsLastItem = cursor.isLast() ? true : false; - mIsFirstItem = cursor.isFirst() ? true : false; - mIsOnlyOneItem = (cursor.getCount() == 1); - mIsMultiNotesFollowingFolder = false; - mIsOneNoteFollowingFolder = false; - - if (mType == Notes.TYPE_NOTE && !mIsFirstItem) { - int position = cursor.getPosition(); - if (cursor.moveToPrevious()) { - if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER - || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) { - if (cursor.getCount() > (position + 1)) { - mIsMultiNotesFollowingFolder = true; - } else { - mIsOneNoteFollowingFolder = true; - } - } - if (!cursor.moveToNext()) { - throw new IllegalStateException("cursor move to previous but can't move back"); - } - } - } - } - - public boolean isOneFollowingFolder() { - return mIsOneNoteFollowingFolder; - } - - public boolean isMultiFollowingFolder() { - return mIsMultiNotesFollowingFolder; - } - - public boolean isLast() { - return mIsLastItem; - } - - public String getCallName() { - return mName; - } - - public boolean isFirst() { - return mIsFirstItem; - } - - public boolean isSingle() { - return mIsOnlyOneItem; - } - - public long getId() { - return mId; - } - - public long getAlertDate() { - return mAlertDate; - } - - public long getCreatedDate() { - return mCreatedDate; - } - - public boolean hasAttachment() { - return mHasAttachment; - } - - public long getModifiedDate() { - return mModifiedDate; - } - - public int getBgColorId() { - return mBgColorId; - } - - public long getParentId() { - return mParentId; - } - - public int getNotesCount() { - return mNotesCount; - } - - public long getFolderId () { - return mParentId; - } - - public int getType() { - return mType; - } - - public int getWidgetType() { - return mWidgetType; - } - - public int getWidgetId() { - return mWidgetId; - } - - public String getSnippet() { - return mSnippet; - } - - public boolean hasAlert() { - return (mAlertDate > 0); - } - - public boolean isCallRecord() { - return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber)); - } - - public static int getNoteType(Cursor cursor) { - return cursor.getInt(TYPE_COLUMN); - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java deleted file mode 100644 index 09e288a..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ /dev/null @@ -1,1013 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.appwidget.AppWidgetManager; -import android.content.AsyncQueryHandler; -import android.content.ContentResolver; -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.os.AsyncTask; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.text.Editable; -import android.text.TextUtils; -import android.text.TextWatcher; -import android.util.Log; -import android.view.ActionMode; -import android.view.ContextMenu; -import android.view.ContextMenu.ContextMenuInfo; -import android.view.Display; -import android.view.HapticFeedbackConstants; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; -import android.view.MenuItem.OnMenuItemClickListener; -import android.view.MotionEvent; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.View.OnCreateContextMenuListener; -import android.view.View.OnTouchListener; -import android.view.inputmethod.InputMethodManager; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; -import android.widget.AdapterView.OnItemLongClickListener; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ListView; -import android.widget.PopupMenu; -import android.widget.TextView; -import android.widget.Toast; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.remote.GTaskSyncService; -import net.micode.notes.model.WorkingNote; -import net.micode.notes.tool.BackupUtils; -import net.micode.notes.tool.DataUtils; -import net.micode.notes.tool.ResourceParser; -import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute; -import net.micode.notes.widget.NoteWidgetProvider_2x; -import net.micode.notes.widget.NoteWidgetProvider_4x; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.HashSet; - -//主界面,一进入就是这个界面 - -public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { - private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; - - private static final int FOLDER_LIST_QUERY_TOKEN = 1; - - private static final int MENU_FOLDER_DELETE = 0; - - private static final int MENU_FOLDER_VIEW = 1; - - private static final int MENU_FOLDER_CHANGE_NAME = 2; - - private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; - - private enum ListEditState { - NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER - }; - - private ListEditState mState; - - private BackgroundQueryHandler mBackgroundQueryHandler; - - private NotesListAdapter mNotesListAdapter; - - private ListView mNotesListView; - - private Button mAddNewNote; - - private boolean mDispatch; - - private int mOriginY; - - private int mDispatchY; - - private TextView mTitleBar; - - private long mCurrentFolderId; - - private ContentResolver mContentResolver; - - private ModeCallback mModeCallBack; - - private static final String TAG = "NotesListActivity"; - - public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; - - private NoteItemData mFocusNoteDataItem; - - private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?"; - - private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>" - + Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + "=?)" + " OR (" - + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND " - + NoteColumns.NOTES_COUNT + ">0)"; - - private final static int REQUEST_CODE_OPEN_NODE = 102; - private final static int REQUEST_CODE_NEW_NODE = 103; - - @Override - // 创建类 - protected void onCreate(final Bundle savedInstanceState) { - //需要是final类型 - // 根据程序上下文环境,Java关键字final有“这是无法改变的”或者“终态的”含义,它可以修饰非抽象类、非抽象类成员方法和变量。 - //final类不能被继承,没有子类,final类中的方法默认是final的。 - //final方法不能被子类的方法覆盖,但可以被继承。 - //final成员变量表示常量,只能被赋值一次,赋值后值不再改变。 - //final不能用于修饰构造方法。 - super.onCreate(savedInstanceState); - // 调用父类的onCreate函数 - setContentView(R.layout.note_list); - initResources(); - - /** - * Insert an introduction when user firstly use this application - */ - setAppInfoFromRawRes(); - } - - @Override - // 返回一些子模块完成的数据交给主Activity处理 - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - // 结果值 和 要求值 符合要求 - if (resultCode == RESULT_OK - && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) { - mNotesListAdapter.changeCursor(null); - } else { - super.onActivityResult(requestCode, resultCode, data); - // 调用 Activity 的onActivityResult() - } - } - - private void setAppInfoFromRawRes() { - // Android平台给我们提供了一个SharedPreferences类,它是一个轻量级的存储类,特别适合用于保存软件配置参数。 - SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); - if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { - StringBuilder sb = new StringBuilder(); - InputStream in = null; - try { - // 把资源文件放到应用程序的/raw/raw下,那么就可以在应用中使用getResources获取资源后, - // 以openRawResource方法(不带后缀的资源文件名)打开这个文件。 - in = getResources().openRawResource(R.raw.introduction); - if (in != null) { - InputStreamReader isr = new InputStreamReader(in); - BufferedReader br = new BufferedReader(isr); - char [] buf = new char[1024]; // 自行定义的数值,使用者不知道有什么意义 - int len = 0; - while ((len = br.read(buf)) > 0) { - sb.append(buf, 0, len); - } - } else { - Log.e(TAG, "Read introduction file error"); - return; - } - } catch (IOException e) { - e.printStackTrace(); - return; - } finally { - if (in != null) { - try { - in.close(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - } - - // 创建空的WorkingNote - WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER, - AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE, - ResourceParser.RED); - note.setWorkingText(sb.toString()); - if (note.saveNote()) { - // 更新保存note的信息 - sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit(); - } else { - Log.e(TAG, "Save introduction note error"); - return; - } - } - } - - @Override - protected void onStart() { - super.onStart(); - startAsyncNotesListQuery(); - } - - // 初始化资源 - private void initResources() { - mContentResolver = this.getContentResolver(); // 获取应用程序的数据,得到类似数据表的东西 - mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver()); - mCurrentFolderId = Notes.ID_ROOT_FOLDER; - - // findViewById 是安卓编程的定位函数,主要是引用.R文件里的引用名 - mNotesListView = (ListView) findViewById(R.id.notes_list); // 绑定XML中的ListView,作为Item的容器 - mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null), - null, false); - mNotesListView.setOnItemClickListener(new OnListItemClickListener()); - mNotesListView.setOnItemLongClickListener(this); - mNotesListAdapter = new NotesListAdapter(this); - mNotesListView.setAdapter(mNotesListAdapter); - mAddNewNote = (Button) findViewById(R.id.btn_new_note);// 在activity中要获取该按钮 - mAddNewNote.setOnClickListener(this); - mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener()); - mDispatch = false; - mDispatchY = 0; - mOriginY = 0; - mTitleBar = (TextView) findViewById(R.id.tv_title_bar); - mState = ListEditState.NOTE_LIST; - mModeCallBack = new ModeCallback(); - } - - // 继承自ListView.MultiChoiceModeListener 和 OnMenuItemClickListener - private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener { - private DropdownMenu mDropDownMenu; - private ActionMode mActionMode; - private MenuItem mMoveMenu; - - public boolean onCreateActionMode(ActionMode mode, Menu menu) { - getMenuInflater().inflate(R.menu.note_list_options, menu); - menu.findItem(R.id.delete).setOnMenuItemClickListener(this); - mMoveMenu = menu.findItem(R.id.move); - if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER - || DataUtils.getUserFolderCount(mContentResolver) == 0) { - mMoveMenu.setVisible(false); - } else { - mMoveMenu.setVisible(true); - mMoveMenu.setOnMenuItemClickListener(this); - } - mActionMode = mode; - mNotesListAdapter.setChoiceMode(true); - mNotesListView.setLongClickable(false); - mAddNewNote.setVisibility(View.GONE); - - View customView = LayoutInflater.from(NotesListActivity.this).inflate( - R.layout.note_list_dropdown_menu, null); - mode.setCustomView(customView); - mDropDownMenu = new DropdownMenu(NotesListActivity.this, - (Button) customView.findViewById(R.id.selection_menu), - R.menu.note_list_dropdown); - mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){ - public boolean onMenuItemClick(final MenuItem item) { - mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected()); - updateMenu(); - return true; - } - - }); - return true; - } - - // 更新菜单 - private void updateMenu() { - int selectedCount = mNotesListAdapter.getSelectedCount(); - // Update dropdown menu - String format = getResources().getString(R.string.menu_select_title, selectedCount); - mDropDownMenu.setTitle(format); // 更改标题 - MenuItem item = mDropDownMenu.findItem(R.id.action_select_all); - if (item != null) { - if (mNotesListAdapter.isAllSelected()) { - item.setChecked(true); - item.setTitle(R.string.menu_deselect_all); - } else { - item.setChecked(false); - item.setTitle(R.string.menu_select_all); - } - } - } - - public boolean onPrepareActionMode(ActionMode mode, Menu menu) { - // TODO Auto-generated method stub - return false; - } - - public boolean onActionItemClicked(ActionMode mode, MenuItem item) { - // TODO Auto-generated method stub - return false; - } - - public void onDestroyActionMode(ActionMode mode) { - mNotesListAdapter.setChoiceMode(false); - mNotesListView.setLongClickable(true); - mAddNewNote.setVisibility(View.VISIBLE); - } - - public void finishActionMode() { - mActionMode.finish(); - } - - public void onItemCheckedStateChanged(ActionMode mode, int position, long id, - boolean checked) { - mNotesListAdapter.setCheckedItem(position, checked); - updateMenu(); - } - - public boolean onMenuItemClick(MenuItem item) { - if (mNotesListAdapter.getSelectedCount() == 0) { - Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none), - Toast.LENGTH_SHORT).show(); - return true; - } - - switch (item.getItemId()) { - case R.id.delete: - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_notes, - mNotesListAdapter.getSelectedCount())); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - batchDelete(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case R.id.move: - startQueryDestinationFolders(); - break; - default: - return false; - } - return true; - } - } - - private class NewNoteOnTouchListener implements OnTouchListener { - - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: { - Display display = getWindowManager().getDefaultDisplay(); - int screenHeight = display.getHeight(); - int newNoteViewHeight = mAddNewNote.getHeight(); - int start = screenHeight - newNoteViewHeight; - int eventY = start + (int) event.getY(); - /** - * Minus TitleBar's height - */ - if (mState == ListEditState.SUB_FOLDER) { - eventY -= mTitleBar.getHeight(); - start -= mTitleBar.getHeight(); - } - /** - * HACKME:When click the transparent part of "New Note" button, dispatch - * the event to the list view behind this button. The transparent part of - * "New Note" button could be expressed by formula y=-0.12x+94锛圲nit:pixel锛� - * and the line top of the button. The coordinate based on left of the "New - * Note" button. The 94 represents maximum height of the transparent part. - * Notice that, if the background of the button changes, the formula should - * also change. This is very bad, just for the UI designer's strong requirement. - */ - if (event.getY() < (event.getX() * (-0.12) + 94)) { - View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1 - - mNotesListView.getFooterViewsCount()); - if (view != null && view.getBottom() > start - && (view.getTop() < (start + 94))) { - mOriginY = (int) event.getY(); - mDispatchY = eventY; - event.setLocation(event.getX(), mDispatchY); - mDispatch = true; - return mNotesListView.dispatchTouchEvent(event); - } - } - break; - } - case MotionEvent.ACTION_MOVE: { - if (mDispatch) { - mDispatchY += (int) event.getY() - mOriginY; - event.setLocation(event.getX(), mDispatchY); - return mNotesListView.dispatchTouchEvent(event); - } - break; - } - default: { - if (mDispatch) { - event.setLocation(event.getX(), mDispatchY); - mDispatch = false; - return mNotesListView.dispatchTouchEvent(event); - } - break; - } - } - return false; - } - - }; - - private void startAsyncNotesListQuery() { - String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION - : NORMAL_SELECTION; - mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, - Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { - String.valueOf(mCurrentFolderId) - }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); - } - - private final class BackgroundQueryHandler extends AsyncQueryHandler { - public BackgroundQueryHandler(ContentResolver contentResolver) { - super(contentResolver); - } - - @Override - protected void onQueryComplete(int token, Object cookie, Cursor cursor) { - switch (token) { - case FOLDER_NOTE_LIST_QUERY_TOKEN: - mNotesListAdapter.changeCursor(cursor); - break; - case FOLDER_LIST_QUERY_TOKEN: - if (cursor != null && cursor.getCount() > 0) { - showFolderListMenu(cursor); - } else { - Log.e(TAG, "Query folder failed"); - } - break; - default: - return; - } - } - } - - private void showFolderListMenu(Cursor cursor) { - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(R.string.menu_title_select_folder); - final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor); - builder.setAdapter(adapter, new DialogInterface.OnClickListener() { - - public void onClick(DialogInterface dialog, int which) { - DataUtils.batchMoveToFolder(mContentResolver, - mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which)); - Toast.makeText( - NotesListActivity.this, - getString(R.string.format_move_notes_to_folder, - mNotesListAdapter.getSelectedCount(), - adapter.getFolderName(NotesListActivity.this, which)), - Toast.LENGTH_SHORT).show(); - mModeCallBack.finishActionMode(); - } - }); - builder.show(); - } - - private void createNewNote() { - Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_INSERT_OR_EDIT); - intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId); - this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE); - } - - private void batchDelete() { - new AsyncTask>() { - protected HashSet doInBackground(Void... unused) { - HashSet widgets = mNotesListAdapter.getSelectedWidget(); - if (!isSyncMode()) { - // if not synced, delete notes directly - if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter - .getSelectedItemIds())) { - } else { - Log.e(TAG, "Delete notes error, should not happens"); - } - } else { - // in sync mode, we'll move the deleted note into the trash - // folder - if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter - .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) { - Log.e(TAG, "Move notes to trash folder error, should not happens"); - } - } - return widgets; - } - - @Override - protected void onPostExecute(HashSet widgets) { - if (widgets != null) { - for (AppWidgetAttribute widget : widgets) { - if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID - && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) { - updateWidget(widget.widgetId, widget.widgetType); - } - } - } - mModeCallBack.finishActionMode(); - } - }.execute(); - } - - private void deleteFolder(long folderId) { - if (folderId == Notes.ID_ROOT_FOLDER) { - Log.e(TAG, "Wrong folder id, should not happen " + folderId); - return; - } - - HashSet ids = new HashSet(); - ids.add(folderId); - HashSet widgets = DataUtils.getFolderNoteWidget(mContentResolver, - folderId); - if (!isSyncMode()) { - // if not synced, delete folder directly - DataUtils.batchDeleteNotes(mContentResolver, ids); - } else { - // in sync mode, we'll move the deleted folder into the trash folder - DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER); - } - if (widgets != null) { - for (AppWidgetAttribute widget : widgets) { - if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID - && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) { - updateWidget(widget.widgetId, widget.widgetType); - } - } - } - } - - private void openNode(NoteItemData data) { - Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_VIEW); - intent.putExtra(Intent.EXTRA_UID, data.getId()); - this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); - } - - private void openFolder(NoteItemData data) { - mCurrentFolderId = data.getId(); - startAsyncNotesListQuery(); - if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { - mState = ListEditState.CALL_RECORD_FOLDER; - mAddNewNote.setVisibility(View.GONE); - } else { - mState = ListEditState.SUB_FOLDER; - } - if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { - mTitleBar.setText(R.string.call_record_folder_name); - } else { - mTitleBar.setText(data.getSnippet()); - } - mTitleBar.setVisibility(View.VISIBLE); - } - - public void onClick(View v) { - switch (v.getId()) { - case R.id.btn_new_note: - createNewNote(); - break; - default: - break; - } - } - - private void showSoftInput() { - InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - if (inputMethodManager != null) { - inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0); - } - } - - private void hideSoftInput(View view) { - InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); - } - - private void showCreateOrModifyFolderDialog(final boolean create) { - final AlertDialog.Builder builder = new AlertDialog.Builder(this); - View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null); - final EditText etName = (EditText) view.findViewById(R.id.et_foler_name); - showSoftInput(); - if (!create) { - if (mFocusNoteDataItem != null) { - etName.setText(mFocusNoteDataItem.getSnippet()); - builder.setTitle(getString(R.string.menu_folder_change_name)); - } else { - Log.e(TAG, "The long click data item is null"); - return; - } - } else { - etName.setText(""); - builder.setTitle(this.getString(R.string.menu_create_folder)); - } - - builder.setPositiveButton(android.R.string.ok, null); - builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - hideSoftInput(etName); - } - }); - - final Dialog dialog = builder.setView(view).show(); - final Button positive = (Button)dialog.findViewById(android.R.id.button1); - positive.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - hideSoftInput(etName); - String name = etName.getText().toString(); - if (DataUtils.checkVisibleFolderName(mContentResolver, name)) { - Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name), - Toast.LENGTH_LONG).show(); - etName.setSelection(0, etName.length()); - return; - } - if (!create) { - if (!TextUtils.isEmpty(name)) { - ContentValues values = new ContentValues(); - values.put(NoteColumns.SNIPPET, name); - values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); - values.put(NoteColumns.LOCAL_MODIFIED, 1); - mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID - + "=?", new String[] { - String.valueOf(mFocusNoteDataItem.getId()) - }); - } - } else if (!TextUtils.isEmpty(name)) { - ContentValues values = new ContentValues(); - values.put(NoteColumns.SNIPPET, name); - values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); - mContentResolver.insert(Notes.CONTENT_NOTE_URI, values); - } - dialog.dismiss(); - } - }); - - if (TextUtils.isEmpty(etName.getText())) { - positive.setEnabled(false); - } - /** - * When the name edit text is null, disable the positive button - */ - etName.addTextChangedListener(new TextWatcher() { - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - // TODO Auto-generated method stub - - } - - public void onTextChanged(CharSequence s, int start, int before, int count) { - if (TextUtils.isEmpty(etName.getText())) { - positive.setEnabled(false); - } else { - positive.setEnabled(true); - } - } - - public void afterTextChanged(Editable s) { - // TODO Auto-generated method stub - - } - }); - } - - /* - * 按返回键时根据情况更改类中的数据 - */ - @Override - public void onBackPressed() { switch (mState) { - case SUB_FOLDER: - mCurrentFolderId = Notes.ID_ROOT_FOLDER; - mState = ListEditState.NOTE_LIST; - startAsyncNotesListQuery(); - mTitleBar.setVisibility(View.GONE); - break; - case CALL_RECORD_FOLDER: - mCurrentFolderId = Notes.ID_ROOT_FOLDER; - mState = ListEditState.NOTE_LIST; - mAddNewNote.setVisibility(View.VISIBLE); - mTitleBar.setVisibility(View.GONE); - startAsyncNotesListQuery(); - break; - case NOTE_LIST: - super.onBackPressed(); - break; - default: - break; - } - } - - /** - * 根据不同类型的widget更新插件,通过intent传送数据 - */ - private void updateWidget(int appWidgetId, int appWidgetType) { - Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); - if (appWidgetType == Notes.TYPE_WIDGET_2X) { - intent.setClass(this, NoteWidgetProvider_2x.class); - } else if (appWidgetType == Notes.TYPE_WIDGET_4X) { - intent.setClass(this, NoteWidgetProvider_4x.class); - } else { - Log.e(TAG, "Unspported widget type"); - return; - } - - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - appWidgetId - }); - - sendBroadcast(intent); - setResult(RESULT_OK, intent); - } - - /** - * 声明监听器,建立菜单,包括名称,视图,删除操作,更改名称操作; - */ - private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() { - public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { - if (mFocusNoteDataItem != null) { - menu.setHeaderTitle(mFocusNoteDataItem.getSnippet()); - menu.add(0, MENU_FOLDER_VIEW, 0, R.string.menu_folder_view); - menu.add(0, MENU_FOLDER_DELETE, 0, R.string.menu_folder_delete); - menu.add(0, MENU_FOLDER_CHANGE_NAME, 0, R.string.menu_folder_change_name); - } - } - }; - - @Override - public void onContextMenuClosed(Menu menu) { - if (mNotesListView != null) { - mNotesListView.setOnCreateContextMenuListener(null); - } - super.onContextMenuClosed(menu); - } - - /* (non-Javadoc) - * @see android.app.Activity#onContextItemSelected(android.view.MenuItem) - * 针对menu中不同的选择进行不同的处理,里面详细注释 - */ - @Override - public boolean onContextItemSelected(MenuItem item) { - if (mFocusNoteDataItem == null) { - Log.e(TAG, "The long click data item is null"); - return false; - } - switch (item.getItemId()) { - case MENU_FOLDER_VIEW: - openFolder(mFocusNoteDataItem);//打开对应文件 - break; - case MENU_FOLDER_DELETE: - AlertDialog.Builder builder = new AlertDialog.Builder(this);//设置确认是否删除的对话框 - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_folder)); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - deleteFolder(mFocusNoteDataItem.getId()); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show();//显示对话框 - break; - case MENU_FOLDER_CHANGE_NAME: - showCreateOrModifyFolderDialog(false); - break; - default: - break; - } - - return true; - } - - @Override - public boolean onPrepareOptionsMenu(Menu menu) { - menu.clear(); - if (mState == ListEditState.NOTE_LIST) { - getMenuInflater().inflate(R.menu.note_list, menu); - // set sync or sync_cancel - menu.findItem(R.id.menu_sync).setTitle( - GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync); - } else if (mState == ListEditState.SUB_FOLDER) { - getMenuInflater().inflate(R.menu.sub_folder, menu); - } else if (mState == ListEditState.CALL_RECORD_FOLDER) { - getMenuInflater().inflate(R.menu.call_record_folder, menu); - } else { - Log.e(TAG, "Wrong state:" + mState); - } - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_new_folder: { - showCreateOrModifyFolderDialog(true); - break; - } - case R.id.menu_export_text: { - exportNoteToText(); - break; - } - case R.id.menu_sync: { - if (isSyncMode()) { - if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { - GTaskSyncService.startSync(this); - } else { - GTaskSyncService.cancelSync(this); - } - } else { - startPreferenceActivity(); - } - break; - } - case R.id.menu_setting: { - startPreferenceActivity(); - break; - } - case R.id.menu_new_note: { - createNewNote(); - break; - } - case R.id.menu_search: - onSearchRequested(); - break; - default: - break; - } - return true; - } - - /* 直接调用startSearch函数 - */ - @Override - public boolean onSearchRequested() { - startSearch(null, false, null /* appData */, false); - return true; - } - - /** - * 函数功能:实现将便签导出到文本功能 - */ - private void exportNoteToText() { - final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this); - new AsyncTask() { - - @Override - protected Integer doInBackground(Void... unused) { - return backup.exportToText(); - } - - @Override - protected void onPostExecute(Integer result) { - if (result == BackupUtils.STATE_SD_CARD_UNMOUONTED) { - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(NotesListActivity.this - .getString(R.string.failed_sdcard_export)); - builder.setMessage(NotesListActivity.this - .getString(R.string.error_sdcard_unmounted)); - builder.setPositiveButton(android.R.string.ok, null); - builder.show(); - } else if (result == BackupUtils.STATE_SUCCESS) { - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(NotesListActivity.this - .getString(R.string.success_sdcard_export)); - builder.setMessage(NotesListActivity.this.getString( - R.string.format_exported_file_location, backup - .getExportedTextFileName(), backup.getExportedTextFileDir())); - builder.setPositiveButton(android.R.string.ok, null); - builder.show(); - } else if (result == BackupUtils.STATE_SYSTEM_ERROR) { - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(NotesListActivity.this - .getString(R.string.failed_sdcard_export)); - builder.setMessage(NotesListActivity.this - .getString(R.string.error_sdcard_export)); - builder.setPositiveButton(android.R.string.ok, null); - builder.show(); - } - } - - }.execute(); - } - - /** - * @return - * 功能:判断是否正在同步 - */ - private boolean isSyncMode() { - return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; - } - - /** - * 功能:跳转到PreferenceActivity界面 - */ - private void startPreferenceActivity() { - Activity from = getParent() != null ? getParent() : this; - Intent intent = new Intent(from, NotesPreferenceActivity.class); - from.startActivityIfNeeded(intent, -1); - } - - /** - * @author k - * 函数功能:实现对便签列表项的点击事件(短按) - */ - private class OnListItemClickListener implements OnItemClickListener { - - public void onItemClick(AdapterView parent, View view, int position, long id) { - if (view instanceof NotesListItem) { - NoteItemData item = ((NotesListItem) view).getItemData(); - if (mNotesListAdapter.isInChoiceMode()) { - if (item.getType() == Notes.TYPE_NOTE) { - position = position - mNotesListView.getHeaderViewsCount(); - mModeCallBack.onItemCheckedStateChanged(null, position, id, - !mNotesListAdapter.isSelectedItem(position)); - } - return; - } - - switch (mState) { - case NOTE_LIST: - if (item.getType() == Notes.TYPE_FOLDER - || item.getType() == Notes.TYPE_SYSTEM) { - openFolder(item); - } else if (item.getType() == Notes.TYPE_NOTE) { - openNode(item); - } else { - Log.e(TAG, "Wrong note type in NOTE_LIST"); - } - break; - case SUB_FOLDER: - case CALL_RECORD_FOLDER: - if (item.getType() == Notes.TYPE_NOTE) { - openNode(item); - } else { - Log.e(TAG, "Wrong note type in SUB_FOLDER"); - } - break; - default: - break; - } - } - } - - } - - /** - * 查询目标文件 - */ - private void startQueryDestinationFolders() { - String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?"; - selection = (mState == ListEditState.NOTE_LIST) ? selection: - "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")"; - - mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN, - null, - Notes.CONTENT_NOTE_URI, - FoldersListAdapter.PROJECTION, - selection, - new String[] { - String.valueOf(Notes.TYPE_FOLDER), - String.valueOf(Notes.ID_TRASH_FOLER), - String.valueOf(mCurrentFolderId) - }, - NoteColumns.MODIFIED_DATE + " DESC"); - } - - /* - * 长按某一项时进行的操作 - * 如果长按的是便签,则通过ActionMode菜单实现;如果长按的是文件夹,则通过ContextMenu菜单实现; - * 具体ActionMOde菜单和ContextMenu菜单的详细见精度笔记 - */ - public boolean onItemLongClick(AdapterView parent, View view, int position, long id) { - if (view instanceof NotesListItem) { - mFocusNoteDataItem = ((NotesListItem) view).getItemData(); - if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) { - if (mNotesListView.startActionMode(mModeCallBack) != null) { - mModeCallBack.onItemCheckedStateChanged(null, position, id, true); - mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); - } else { - Log.e(TAG, "startActionMode fails"); - } - } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) { - mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener); - } - } - return false; - } -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java deleted file mode 100644 index bf1f825..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java +++ /dev/null @@ -1,262 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.content.Context; -import android.database.Cursor; -import android.util.Log; -import android.view.View; -import android.view.ViewGroup; -import android.widget.CursorAdapter; - -import net.micode.notes.data.Notes; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; - -/* - * 便签表连接,继承了CursorAdapter,它为cursor和ListView提供了连接的桥梁。 - * 所以NotesListAdapter实现的是鼠标和编辑便签链接的桥梁 - */ -public class NotesListAdapter extends CursorAdapter { - private static final String TAG = "NotesListAdapter"; - private Context mContext; - private HashMap mSelectedIndex; - private int mNotesCount; //便签数 - private boolean mChoiceMode; //选择模式标记 - - /* - * 桌面widget的属性,包括编号和类型 - */ - public static class AppWidgetAttribute { - public int widgetId; - public int widgetType; - }; - - /* - * 函数功能:初始化便签链接器 - * 函数实现:根据传进来的内容设置相关变量 - */ - public NotesListAdapter(Context context) { - super(context, null); //父类对象置空 - mSelectedIndex = new HashMap(); //新建选项下标的hash表 - mContext = context; - mNotesCount = 0; - } - - @Override - /* - * 函数功能:新建一个视图来存储光标所指向的数据 - * 函数实现:使用兄弟类NotesListItem新建一个项目选项 - */ - public View newView(Context context, Cursor cursor, ViewGroup parent) { - return new NotesListItem(context); - } - - /* - * 函数功能:将已经存在的视图和鼠标指向的数据进行捆绑 - */ - @Override - public void bindView(View view, Context context, Cursor cursor) { - if (view instanceof NotesListItem) { - //若view是NotesListItem的一个实例 - NoteItemData itemData = new NoteItemData(context, cursor); - ((NotesListItem) view).bind(context, itemData, mChoiceMode, - isSelectedItem(cursor.getPosition())); - //则新建一个项目选项并且用bind跟将view和鼠标,内容,便签数据捆绑在一起 - } - } - - /* - * 函数功能:设置勾选框 - */ - public void setCheckedItem(final int position, final boolean checked) { - mSelectedIndex.put(position, checked); - //根据定位和是否勾选设置下标 - notifyDataSetChanged(); - //在修改后刷新activity - } - - /* - * 函数功能:判断单选按钮是否勾选 - */ - public boolean isInChoiceMode() { - return mChoiceMode; - } - - /* - * 函数功能:设置单项选项框 - * 函数实现:重置下标并且根据参数mode设置选项 - */ - public void setChoiceMode(boolean mode) { - mSelectedIndex.clear(); - mChoiceMode = mode; - } - - /* - * 函数功能:选择全部选项 - */ - public void selectAll(boolean checked) { - Cursor cursor = getCursor(); - //获取光标位置 - for (int i = 0; i < getCount(); i++) { - if (cursor.moveToPosition(i)) { - if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) { - setCheckedItem(i, checked); - } - } - } - //遍历所有光标可用的位置在判断为便签类型之后勾选单项框 - } - - /* - * 函数功能:建立选择项的下标列表 - */ - public HashSet getSelectedItemIds() { - HashSet itemSet = new HashSet(); - //建立hash表 - for (Integer position : mSelectedIndex.keySet()) { - //遍历所有的关键 - if (mSelectedIndex.get(position) == true) { - //若光标位置可用 - Long id = getItemId(position); - if (id == Notes.ID_ROOT_FOLDER) { - //原文件不需要添加 - Log.d(TAG, "Wrong item id, should not happen"); - } else { - itemSet.add(id); - } - //则将id该下标假如选项集合中 - - } - } - - return itemSet; - } - - /* - * 函数功能:建立桌面Widget的选项表 - */ - public HashSet getSelectedWidget() { - HashSet itemSet = new HashSet(); - for (Integer position : mSelectedIndex.keySet()) { - if (mSelectedIndex.get(position) == true) { - Cursor c = (Cursor) getItem(position); - //以上4句和getSelectedItemIds一样,不再重复 - if (c != null) { - //光标位置可用的话就建立新的Widget属性并编辑下标和类型,最后添加到选项集中 - AppWidgetAttribute widget = new AppWidgetAttribute(); - NoteItemData item = new NoteItemData(mContext, c); - widget.widgetId = item.getWidgetId(); - widget.widgetType = item.getWidgetType(); - itemSet.add(widget); - /** - * Don't close cursor here, only the adapter could close it - */ - } else { - Log.e(TAG, "Invalid cursor"); - return null; - } - } - } - return itemSet; - } - - /* - * 函数功能:获取选项个数 - */ - public int getSelectedCount() { - Collection values = mSelectedIndex.values(); - //首先获取选项下标的值 - if (null == values) { - return 0; - } - Iterator iter = values.iterator(); - //初始化叠加器 - int count = 0; - while (iter.hasNext()) { - if (true == iter.next()) { - //若value值为真计数+1 - count++; - } - } - return count; - } - - /* - * 函数功能:判断是否全部选中 - */ - public boolean isAllSelected() { - int checkedCount = getSelectedCount(); - return (checkedCount != 0 && checkedCount == mNotesCount); - //获取选项数看是否等于便签的个数 - } - - /* - * 函数功能:判断是否为选项表 - * 函数实现:通过传递的下标来确定 - */ - public boolean isSelectedItem(final int position) { - if (null == mSelectedIndex.get(position)) { - return false; - } - return mSelectedIndex.get(position); - } - - @Override - /* - * 函数功能:在activity内容发生局部变动的时候回调该函数计算便签的数量 - */ - protected void onContentChanged() { - super.onContentChanged(); - //执行基类函数 - calcNotesCount(); - } - - @Override - /* - * 函数功能:在activity光标发生局部变动的时候回调该函数计算便签的数量 - */ - public void changeCursor(Cursor cursor) { - super.changeCursor(cursor); - //执行基类函数 - calcNotesCount(); - } - - /* - * 函数功能:计算便签数量 - */ - private void calcNotesCount() { - mNotesCount = 0; - for (int i = 0; i < getCount(); i++) { - //获取总数同时遍历 - Cursor c = (Cursor) getItem(i); - if (c != null) { - if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) { - mNotesCount++; - //若该位置不为空并且文本类型为便签就+1 - } - } else { - Log.e(TAG, "Invalid cursor"); - return; - } - //否则报错 - } - } -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java deleted file mode 100644 index 5cee1b2..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.content.Context; -import android.text.format.DateUtils; -import android.view.View; -import android.widget.CheckBox; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.tool.DataUtils; -import net.micode.notes.tool.ResourceParser.NoteItemBgResources; - - -//创建便签列表项目选项 -public class NotesListItem extends LinearLayout { - private ImageView mAlert;//闹钟图片 - private TextView mTitle; //标题 - private TextView mTime; //时间 - private TextView mCallName; //人名 - private NoteItemData mItemData; //标签数据 - private CheckBox mCheckBox; //打钩框 - - /*初始化基本信息*/ - public NotesListItem(Context context) { - super(context); //super()它的主要作用是调整调用父类构造函数的顺序 - inflate(context, R.layout.note_item, this);//Inflate可用于将一个xml中定义的布局控件找出来,这里的xml是r。layout - //findViewById用于从contentView中查找指定ID的View,转换出来的形式根据需要而定; - mAlert = (ImageView) findViewById(R.id.iv_alert_icon); - mTitle = (TextView) findViewById(R.id.tv_title); - mTime = (TextView) findViewById(R.id.tv_time); - mCallName = (TextView) findViewById(R.id.tv_name); - mCheckBox = (CheckBox) findViewById(android.R.id.checkbox); - } - ///根据data的属性对各个控件的属性的控制,主要是可见性Visibility,内容setText,格式setTextAppearance - public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) { - if (choiceMode && data.getType() == Notes.TYPE_NOTE) { - mCheckBox.setVisibility(View.VISIBLE); ///设置可见行为可见 - mCheckBox.setChecked(checked); ///格子打钩 - } else { - mCheckBox.setVisibility(View.GONE); - } - - mItemData = data; - ///设置控件属性,一共三种情况,由data的id和父id是否与保存到文件夹的id一致来决定 - if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { - mCallName.setVisibility(View.GONE); - mAlert.setVisibility(View.VISIBLE); - //设置该textview的style - mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); - //settext为设置内容 - mTitle.setText(context.getString(R.string.call_record_folder_name) - + context.getString(R.string.format_folder_files_count, data.getNotesCount())); - mAlert.setImageResource(R.drawable.call_record); - } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) { - mCallName.setVisibility(View.VISIBLE); - mCallName.setText(data.getCallName()); - mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem); - mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); - ///关于闹钟的设置 - if (data.hasAlert()) { - mAlert.setImageResource(R.drawable.clock);//图片来源的设置 - mAlert.setVisibility(View.VISIBLE); - } else { - mAlert.setVisibility(View.GONE); - } - } else { - mCallName.setVisibility(View.GONE); - mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); - ///设置title格式 - if (data.getType() == Notes.TYPE_FOLDER) { - mTitle.setText(data.getSnippet() - + context.getString(R.string.format_folder_files_count, - data.getNotesCount())); - mAlert.setVisibility(View.GONE); - } else { - mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); - if (data.hasAlert()) { - mAlert.setImageResource(R.drawable.clock);///设置图片来源 - mAlert.setVisibility(View.VISIBLE); - } else { - mAlert.setVisibility(View.GONE); - } - } - } - ///设置内容,获取相关时间,从data里编辑的日期中获取 - mTime. setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); - - setBackground(data); - } - //根据data的文件属性来设置背景 - private void setBackground(NoteItemData data) { - int id = data.getBgColorId(); - //,若是note型文件,则4种情况,对于4种不同情况的背景来源 - if (data.getType() == Notes.TYPE_NOTE) { - //单个数据并且只有一个子文件夹 - if (data.isSingle() || data.isOneFollowingFolder()) { - setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id)); - } else if (data.isLast()) {//是最后一个数据 - setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id)); - } else if (data.isFirst() || data.isMultiFollowingFolder()) {//是一个数据并有多个子文件夹 - setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id)); - } else { - setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id)); - } - } else { - //若不是note直接调用文件夹的背景来源 - setBackgroundResource(NoteItemBgResources.getFolderBgRes()); - } - } - public NoteItemData getItemData() { - return mItemData; - } -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java deleted file mode 100644 index 1b69811..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java +++ /dev/null @@ -1,516 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.accounts.Account; -import android.accounts.AccountManager; -import android.app.AlertDialog; -import android.content.BroadcastReceiver; -import android.content.ContentValues; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.SharedPreferences; -import android.os.Bundle; -import android.preference.Preference; -import android.preference.Preference.OnPreferenceClickListener; -import android.preference.PreferenceActivity; -import android.preference.PreferenceCategory; -import android.text.TextUtils; -import android.text.format.DateFormat; -import android.view.LayoutInflater; -import android.view.MenuItem; -import android.view.View; -import android.widget.Button; -import android.widget.TextView; -import android.widget.Toast; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.remote.GTaskSyncService; - -/* - *该类功能:NotesPreferenceActivity,在小米便签中主要实现的是对背景颜色和字体大小的数据储存。 - * 继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity - */ -public class NotesPreferenceActivity extends PreferenceActivity { - public static final String PREFERENCE_NAME = "notes_preferences"; - //优先名 - public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name"; - //同步账号 - public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time"; - //同步时间 - public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear"; - - private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key"; - //同步密码 - private static final String AUTHORITIES_FILTER_KEY = "authorities"; - //本地密码 - private PreferenceCategory mAccountCategory; - //账户分组 - private GTaskReceiver mReceiver; - //同步任务接收器 - private Account[] mOriAccounts; - //账户 - private boolean mHasAddedAccount; - //账户的hash标记 - - @Override - /* - *函数功能:创建一个activity,在函数里要完成所有的正常静态设置 - *参数:Bundle icicle:存放了 activity 当前的状态 - */ - protected void onCreate(Bundle icicle) { - //先执行父类的创建函数 - super.onCreate(icicle); - - /* using the app icon for navigation */ - getActionBar().setDisplayHomeAsUpEnabled(true); - //给左上角图标的左边加上一个返回的图标 - - addPreferencesFromResource(R.xml.preferences); - //添加xml来源并显示 xml - mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY); - //根据同步账户关键码来初始化分组 - mReceiver = new GTaskReceiver(); - IntentFilter filter = new IntentFilter(); - filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME); - registerReceiver(mReceiver, filter); - //初始化同步组件 - - mOriAccounts = null; - View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); - //获取listvivew,ListView的作用:用于列出所有选择 - getListView().addHeaderView(header, null, true); - //在listview组件上方添加其他组件 - } - - @Override - /* - * 函数功能:activity交互功能的实现,用于接受用户的输入 - */ - protected void onResume() { - //先执行父类 的交互实现 - super.onResume(); - - // need to set sync account automatically if user has added a new - // account - if (mHasAddedAccount) { - //若用户新加了账户则自动设置同步账户 - Account[] accounts = getGoogleAccounts(); - //获取google同步账户 - if (mOriAccounts != null && accounts.length > mOriAccounts.length) { - //若原账户不为空且当前账户有增加 - for (Account accountNew : accounts) { - boolean found = false; - for (Account accountOld : mOriAccounts) { - if (TextUtils.equals(accountOld.name, accountNew.name)) { - //更新账户 - found = true; - break; - } - } - if (!found) { - setSyncAccount(accountNew.name); - //若是没有找到旧的账户,那么同步账号中就只添加新账户 - break; - } - } - } - } - - refreshUI(); - //刷新标签界面 - } - - @Override - /* - * 函数功能:删除一个activity - */ - protected void onDestroy() { - if (mReceiver != null) { - unregisterReceiver(mReceiver); - //注销接收器 - } - super.onDestroy(); - //执行父类的销毁动作 - } - - /* - * 函数功能:重新设置账户信息 - */ - private void loadAccountPreference() { - mAccountCategory.removeAll(); - //销毁所有的分组 - Preference accountPref = new Preference(this); - //建立首选项 - final String defaultAccount = getSyncAccountName(this); - accountPref.setTitle(getString(R.string.preferences_account_title)); - accountPref.setSummary(getString(R.string.preferences_account_summary)); - //设置首选项的大标题和小标题 - accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() { - public boolean onPreferenceClick(Preference preference) { - //建立监听器 - if (!GTaskSyncService.isSyncing()) { - if (TextUtils.isEmpty(defaultAccount)) { - // the first time to set account - //若是第一次建立账户显示选择账户提示对话框 - showSelectAccountAlertDialog(); - } else { - // if the account has already been set, we need to promp - // user about the risk - //若是已经建立则显示修改对话框并进行修改操作 - showChangeAccountConfirmAlertDialog(); - } - } else { - //若在没有同步的情况下,则在toast中显示不能修改 - Toast.makeText(NotesPreferenceActivity.this, - R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT) - .show(); - } - return true; - } - }); - - //根据新建首选项编辑新的账户分组 - mAccountCategory.addPreference(accountPref); - } - - /* - *函数功能:设置按键的状态和最后同步的时间 - */ - private void loadSyncButton() { - Button syncButton = (Button) findViewById(R.id.preference_sync_button); - TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview); - //获取同步按钮控件和最终同步时间的的窗口 - // set button state - //设置按钮的状态 - if (GTaskSyncService.isSyncing()) { - //若是在同步状态下 - syncButton.setText(getString(R.string.preferences_button_sync_cancel)); - syncButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - GTaskSyncService.cancelSync(NotesPreferenceActivity.this); - } - }); - //设置按钮显示的文本为“取消同步”以及监听器 - } else { - syncButton.setText(getString(R.string.preferences_button_sync_immediately)); - syncButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - GTaskSyncService.startSync(NotesPreferenceActivity.this); - } - }); - //若是不同步则设置按钮显示的文本为“立即同步”以及对应监听器 - } - syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this))); - //设置按键可用还是不可用 - - // set last sync time - // 设置最终同步时间 - if (GTaskSyncService.isSyncing()) { - //若是在同步的情况下 - lastSyncTimeView.setText(GTaskSyncService.getProgressString()); - lastSyncTimeView.setVisibility(View.VISIBLE); - // 根据当前同步服务器设置时间显示框的文本以及可见性 - } else { - //若是非同步情况 - long lastSyncTime = getLastSyncTime(this); - if (lastSyncTime != 0) { - lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time, - DateFormat.format(getString(R.string.preferences_last_sync_time_format), - lastSyncTime))); - lastSyncTimeView.setVisibility(View.VISIBLE); - //则根据最后同步时间的信息来编辑时间显示框的文本内容和可见性 - } else { - //若时间为空直接设置为不可见状态 - lastSyncTimeView.setVisibility(View.GONE); - } - } - } - /* - *函数功能:刷新标签界面 - *函数实现:调用上文设置账号和设置按键两个函数来实现 - */ - private void refreshUI() { - loadAccountPreference(); - loadSyncButton(); - } - - /* - * 函数功能:显示账户选择的对话框并进行账户的设置 - */ - private void showSelectAccountAlertDialog() { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); - //创建一个新的对话框 - - View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); - TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); - titleTextView.setText(getString(R.string.preferences_dialog_select_account_title)); - TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); - subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips)); - //设置标题以及子标题的内容 - dialogBuilder.setCustomTitle(titleView); - dialogBuilder.setPositiveButton(null, null); - //设置对话框的自定义标题,建立一个YES的按钮 - Account[] accounts = getGoogleAccounts(); - String defAccount = getSyncAccountName(this); - //获取同步账户信息 - mOriAccounts = accounts; - mHasAddedAccount = false; - - if (accounts.length > 0) { - //若账户不为空 - CharSequence[] items = new CharSequence[accounts.length]; - final CharSequence[] itemMapping = items; - int checkedItem = -1; - int index = 0; - for (Account account : accounts) { - if (TextUtils.equals(account.name, defAccount)) { - checkedItem = index; - //在账户列表中查询到所需账户 - } - items[index++] = account.name; - } - dialogBuilder.setSingleChoiceItems(items, checkedItem, - //在对话框建立一个单选的复选框 - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - setSyncAccount(itemMapping[which].toString()); - dialog.dismiss(); - //取消对话框 - refreshUI(); - } - //设置点击后执行的事件,包括检录新同步账户和刷新标签界面 - }); - //建立对话框网络版的监听器 - } - - View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null); - dialogBuilder.setView(addAccountView); - //给新加账户对话框设置自定义样式 - - final AlertDialog dialog = dialogBuilder.show(); - //显示对话框 - addAccountView.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - mHasAddedAccount = true; - //将新加账户的hash置true - Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); - //建立网络建立组件 - intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] { - "gmail-ls" - }); - startActivityForResult(intent, -1); - //跳回上一个选项 - dialog.dismiss(); - } - }); - //建立新加账户对话框的监听器 - } - - /* - * 函数功能:显示账户选择对话框和相关账户操作 - */ - private void showChangeAccountConfirmAlertDialog() { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); - //创建一个新的对话框 - View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); - TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); - titleTextView.setText(getString(R.string.preferences_dialog_change_account_title, - getSyncAccountName(this))); - TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); - subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg)); - //根据同步修改的账户信息设置标题以及子标题的内容 - dialogBuilder.setCustomTitle(titleView); - //设置对话框的自定义标题 - CharSequence[] menuItemArray = new CharSequence[] { - getString(R.string.preferences_menu_change_account), - getString(R.string.preferences_menu_remove_account), - getString(R.string.preferences_menu_cancel) - }; - //定义一些标记字符串 - dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() { - //设置对话框要显示的一个list,用于显示几个命令时,即change,remove,cancel - public void onClick(DialogInterface dialog, int which) { - //按键功能,由which来决定 - if (which == 0) { - //进入账户选择对话框 - showSelectAccountAlertDialog(); - } else if (which == 1) { - //删除账户并且跟新便签界面 - removeSyncAccount(); - refreshUI(); - } - } - }); - dialogBuilder.show(); - //显示对话框 - } - - /* - *函数功能:获取谷歌账户 - *函数实现:通过账户管理器直接获取 - */ - private Account[] getGoogleAccounts() { - AccountManager accountManager = AccountManager.get(this); - return accountManager.getAccountsByType("com.google"); - } - - /* - * 函数功能:设置同步账户 - */ - private void setSyncAccount(String account) { - if (!getSyncAccountName(this).equals(account)) { - //假如该账号不在同步账号列表中 - SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = settings.edit(); - //编辑共享的首选项 - if (account != null) { - editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account); - } else { - editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, ""); - } - //将该账号加入到首选项中 - - editor.commit(); - //提交修改的数据 - - - setLastSyncTime(this, 0); - //将最后同步时间清零 - - // clean up local gtask related info - new Thread(new Runnable() { - public void run() { - ContentValues values = new ContentValues(); - values.put(NoteColumns.GTASK_ID, ""); - values.put(NoteColumns.SYNC_ID, 0); - getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null); - } - }).start(); - //重置当地同步任务的信息 - - Toast.makeText(NotesPreferenceActivity.this, - getString(R.string.preferences_toast_success_set_accout, account), - Toast.LENGTH_SHORT).show(); - //将toast的文本信息置为“设置账户成功”并显示出来 - } - } - /* - * 函数功能:删除同步账户 - */ - private void removeSyncAccount() { - SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = settings.edit(); - //设置共享首选项 - - if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) { - editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME); - //假如当前首选项中有账户就删除 - } - if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) { - editor.remove(PREFERENCE_LAST_SYNC_TIME); - //删除当前首选项中有账户时间 - } - editor.commit(); - //提交更新后的数据 - - // clean up local gtask related info - new Thread(new Runnable() { - public void run() { - ContentValues values = new ContentValues(); - values.put(NoteColumns.GTASK_ID, ""); - values.put(NoteColumns.SYNC_ID, 0); - getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null); - } - }).start(); - //重置当地同步任务的信息 - } - - /* - * 函数功能:获取同步账户名称 - * 函数实现:通过共享的首选项里的信息直接获取 - */ - public static String getSyncAccountName(Context context) { - SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, - Context.MODE_PRIVATE); - return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, ""); - } - - /* - * 函数功能:设置最终同步的时间 - */ - public static void setLastSyncTime(Context context, long time) { - SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, - Context.MODE_PRIVATE); - SharedPreferences.Editor editor = settings.edit(); - // 从共享首选项中找到相关账户并获取其编辑器 - editor.putLong(PREFERENCE_LAST_SYNC_TIME, time); - editor.commit(); - //编辑最终同步时间并提交更新 - } - /* - * 函数功能:获取最终同步时间 - * 函数实现:通过共享的首选项里的信息直接获取 - */ - public static long getLastSyncTime(Context context) { - SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, - Context.MODE_PRIVATE); - return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0); - } - - /* - * 函数功能:接受同步信息 - * 函数实现:继承BroadcastReceiver - */ - private class GTaskReceiver extends BroadcastReceiver { - - @Override - public void onReceive(Context context, Intent intent) { - refreshUI(); - if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) { - //获取随广播而来的Intent中的同步服务的数据 - TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview); - syncStatus.setText(intent - .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG)); - //通过获取的数据在设置系统的状态 - } - - } - } - - /* - * 函数功能:处理菜单的选项 - * 参数:MenuItem菜单选项 - */ - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - //根据选项的id选择,这里只有一个主页 - case android.R.id.home: - Intent intent = new Intent(this, NotesListActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - startActivity(intent); - return true; - //在主页情况下在创建连接组件intent,发出清空的信号并开始一个相应的activity - default: - return false; - } - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java deleted file mode 100644 index 9d0ee58..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.widget; -import android.app.PendingIntent; -import android.appwidget.AppWidgetManager; -import android.appwidget.AppWidgetProvider; -import android.content.ContentValues; -import android.content.Context; -import android.content.Intent; -import android.database.Cursor; -import android.util.Log; -import android.widget.RemoteViews; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.tool.ResourceParser; -import net.micode.notes.ui.NoteEditActivity; -import net.micode.notes.ui.NotesListActivity; - -//提供注释小插件 -public abstract class NoteWidgetProvider extends AppWidgetProvider { - public static final String [] PROJECTION = new String [] { - NoteColumns.ID, - NoteColumns.BG_COLOR_ID, - NoteColumns.SNIPPET - }; - - public static final int COLUMN_ID = 0; - public static final int COLUMN_BG_COLOR_ID = 1; - public static final int COLUMN_SNIPPET = 2; - - private static final String TAG = "NoteWidgetProvider"; - - @Override - //删除信息 - public void onDeleted(Context context, int[] appWidgetIds) { - ContentValues values = new ContentValues(); - values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); - for (int i = 0; i < appWidgetIds.length; i++) { - context.getContentResolver().update(Notes.CONTENT_NOTE_URI, - values, - NoteColumns.WIDGET_ID + "=?", - new String[] { String.valueOf(appWidgetIds[i])}); - } - } - //调用插件信息 - private Cursor getNoteWidgetInfo(Context context, int widgetId) { - return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, - PROJECTION, - NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?", - new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) }, - null); - } - //更新信息 - protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - update(context, appWidgetManager, appWidgetIds, false); - } - - private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, - boolean privacyMode) { - for (int i = 0; i < appWidgetIds.length; i++) { - if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) { - int bgId = ResourceParser.getDefaultBgId(context); - String snippet = ""; - Intent intent = new Intent(context, NoteEditActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); - intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]); - intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType()); - - Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]); - if (c != null && c.moveToFirst()) { - if (c.getCount() > 1) { - Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]); - c.close(); - return; - } - snippet = c.getString(COLUMN_SNIPPET); - bgId = c.getInt(COLUMN_BG_COLOR_ID); - intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID)); - intent.setAction(Intent.ACTION_VIEW); - } else { - snippet = context.getResources().getString(R.string.widget_havenot_content); - intent.setAction(Intent.ACTION_INSERT_OR_EDIT); - } - - if (c != null) { - c.close(); - } - - RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId()); - rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId)); - intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId); - /** - * Generate the pending intent to start host for the widget - */ - PendingIntent pendingIntent = null; - if (privacyMode) { - rv.setTextViewText(R.id.widget_text, - context.getString(R.string.widget_under_visit_mode)); - pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent( - context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); - } else { - rv.setTextViewText(R.id.widget_text, snippet); - pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent, - PendingIntent.FLAG_UPDATE_CURRENT); - } - - rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent); - appWidgetManager.updateAppWidget(appWidgetIds[i], rv); - } - } - } - - protected abstract int getBgResourceId(int bgId); - - protected abstract int getLayoutId(); - - protected abstract int getWidgetType(); -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java deleted file mode 100644 index e7d7933..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.widget; - -import android.appwidget.AppWidgetManager; -import android.content.Context; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.tool.ResourceParser; - - -//2倍大小的插件 -public class NoteWidgetProvider_2x extends NoteWidgetProvider { - @Override - public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - super.update(context, appWidgetManager, appWidgetIds); - } - - @Override - protected int getLayoutId() { - return R.layout.widget_2x; - } - - @Override - protected int getBgResourceId(int bgId) { - return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId); - } - - @Override - protected int getWidgetType() { - return Notes.TYPE_WIDGET_2X; - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java deleted file mode 100644 index adfb6e1..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.widget; - -import android.appwidget.AppWidgetManager; -import android.content.Context; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.tool.ResourceParser; - -//4倍大小的插件 -public class NoteWidgetProvider_4x extends NoteWidgetProvider { - @Override - public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - super.update(context, appWidgetManager, appWidgetIds); - } - - protected int getLayoutId() { - return R.layout.widget_4x; - } - - @Override - protected int getBgResourceId(int bgId) { - return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId); - } - - @Override - protected int getWidgetType() { - return Notes.TYPE_WIDGET_4X; - } -} diff --git a/src/Notes-master3/app/src/main/res/color/primary_text_dark.xml b/src/Notes-master3/app/src/main/res/color/primary_text_dark.xml deleted file mode 100644 index 8ad98e3..0000000 --- a/src/Notes-master3/app/src/main/res/color/primary_text_dark.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/res/color/secondary_text_dark.xml b/src/Notes-master3/app/src/main/res/color/secondary_text_dark.xml deleted file mode 100644 index 9cf8a1a..0000000 --- a/src/Notes-master3/app/src/main/res/color/secondary_text_dark.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png deleted file mode 100644 index 5eb5d44..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png deleted file mode 100644 index 100db77..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png deleted file mode 100644 index fb88ca4..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/clock.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/clock.png deleted file mode 100644 index 5f2ae9a..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/clock.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/delete.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/delete.png deleted file mode 100644 index 643de3e..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/delete.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png deleted file mode 100644 index 5525025..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png deleted file mode 100644 index 55a1856..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png deleted file mode 100644 index 2cb2d60..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png deleted file mode 100644 index bae944a..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png deleted file mode 100644 index 96e6092..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png deleted file mode 100644 index 08d8644..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png deleted file mode 100644 index 9c430e5..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png deleted file mode 100644 index 19e8d95..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png deleted file mode 100644 index bf8f580..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png deleted file mode 100644 index 918f7a6..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png deleted file mode 100644 index 10cb642..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png deleted file mode 100644 index 78cf2e6..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png deleted file mode 100644 index 9de7ced..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png deleted file mode 100644 index be8e64c..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png deleted file mode 100644 index d3ff104..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png deleted file mode 100644 index 85b13a1..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png deleted file mode 100644 index 418aadc..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png deleted file mode 100644 index 087e1f9..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png deleted file mode 100644 index b88eebf..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png deleted file mode 100644 index 96b1c8b..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png deleted file mode 100644 index d7e7206..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png deleted file mode 100644 index 632e88c..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png deleted file mode 100644 index 829f61b..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png deleted file mode 100644 index 5325c25..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png deleted file mode 100644 index 64a39d9..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png deleted file mode 100644 index 897325a..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png deleted file mode 100644 index c83405f..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png deleted file mode 100644 index 141f9e1..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png deleted file mode 100644 index 4224309..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png deleted file mode 100644 index 9988f17..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png deleted file mode 100644 index 587c348..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png deleted file mode 100644 index 46b4757..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png deleted file mode 100644 index 29f9d8c..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png deleted file mode 100644 index 77a4ab4..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png deleted file mode 100644 index 3e79189..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png deleted file mode 100644 index e23cd5c..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png deleted file mode 100644 index 31cfc1e..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png deleted file mode 100644 index b6549b2..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png deleted file mode 100644 index 3faf507..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png deleted file mode 100644 index 4ae791c..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png deleted file mode 100644 index ccdfc4b..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png deleted file mode 100644 index 1140b71..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png deleted file mode 100644 index e24e0d1..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png deleted file mode 100644 index c748936..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png deleted file mode 100644 index fc49552..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/notification.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/notification.png deleted file mode 100644 index b13ab4a..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/notification.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png deleted file mode 100644 index ff2befd..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/selected.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/selected.png deleted file mode 100644 index b889bef..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/selected.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png deleted file mode 100644 index 544ee9c..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png deleted file mode 100644 index eb6bff0..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png deleted file mode 100644 index a1707f4..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png deleted file mode 100644 index f86886c..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png deleted file mode 100644 index 0e66c29..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png deleted file mode 100644 index 5f0619a..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png deleted file mode 100644 index 12d1c2b..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png deleted file mode 100644 index 9183738..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png deleted file mode 100644 index fa8b452..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png deleted file mode 100644 index 62de074..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png deleted file mode 100644 index a37d67c..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png deleted file mode 100644 index d7c5fa4..0000000 Binary files a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png and /dev/null differ diff --git a/src/Notes-master3/app/src/main/res/drawable/new_note.xml b/src/Notes-master3/app/src/main/res/drawable/new_note.xml deleted file mode 100644 index 2154ebc..0000000 --- a/src/Notes-master3/app/src/main/res/drawable/new_note.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/src/Notes-master3/app/src/main/res/layout/account_dialog_title.xml b/src/Notes-master3/app/src/main/res/layout/account_dialog_title.xml deleted file mode 100644 index 7717112..0000000 --- a/src/Notes-master3/app/src/main/res/layout/account_dialog_title.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/res/layout/add_account_text.xml b/src/Notes-master3/app/src/main/res/layout/add_account_text.xml deleted file mode 100644 index c799178..0000000 --- a/src/Notes-master3/app/src/main/res/layout/add_account_text.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/res/layout/datetime_picker.xml b/src/Notes-master3/app/src/main/res/layout/datetime_picker.xml deleted file mode 100644 index f10d592..0000000 --- a/src/Notes-master3/app/src/main/res/layout/datetime_picker.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml b/src/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml deleted file mode 100644 index 361b39a..0000000 --- a/src/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/res/layout/folder_list_item.xml b/src/Notes-master3/app/src/main/res/layout/folder_list_item.xml deleted file mode 100644 index 77e8148..0000000 --- a/src/Notes-master3/app/src/main/res/layout/folder_list_item.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/res/layout/note_edit.xml b/src/Notes-master3/app/src/main/res/layout/note_edit.xml deleted file mode 100644 index 10b2aa7..0000000 --- a/src/Notes-master3/app/src/main/res/layout/note_edit.xml +++ /dev/null @@ -1,400 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml b/src/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml deleted file mode 100644 index a885f9c..0000000 --- a/src/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - diff --git a/src/Notes-master3/app/src/main/res/layout/note_item.xml b/src/Notes-master3/app/src/main/res/layout/note_item.xml deleted file mode 100644 index d541f6a..0000000 --- a/src/Notes-master3/app/src/main/res/layout/note_item.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Notes-master3/app/src/main/res/layout/note_list.xml b/src/Notes-master3/app/src/main/res/layout/note_list.xml deleted file mode 100644 index 6b25d38..0000000 --- a/src/Notes-master3/app/src/main/res/layout/note_list.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - -