diff --git a/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.bin b/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.bin index fef5c26..0ce5e41 100644 Binary files a/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.bin and b/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.lock b/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.lock index e100c00..9d8f743 100644 Binary files a/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.lock and b/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.bin b/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.bin index 4616973..f093d04 100644 Binary files a/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.bin and b/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.lock b/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.lock index 9c78321..e160f1e 100644 Binary files a/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.lock and b/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/src/Notes1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/src/Notes1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index 3dd9810..eb88b4e 100644 Binary files a/src/Notes1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/src/Notes1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 8777d6e..3debf56 100644 Binary files a/src/Notes1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes1/.gradle/buildOutputCleanup/outputFiles.bin index 11df297..9757a84 100644 Binary files a/src/Notes1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes1/.gradle/file-system.probe b/src/Notes1/.gradle/file-system.probe index 93fcd49..549bc09 100644 Binary files a/src/Notes1/.gradle/file-system.probe and b/src/Notes1/.gradle/file-system.probe differ diff --git a/src/Notes1/app/build.gradle b/src/Notes1/app/build.gradle index 5e44a82..1e39733 100644 --- a/src/Notes1/app/build.gradle +++ b/src/Notes1/app/build.gradle @@ -6,9 +6,9 @@ android { useLibrary'org.apache.http.legacy' defaultConfig { applicationId "net.micode.notes" - minSdkVersion 22 + minSdkVersion 19 //noinspection ExpiredTargetSdkVersion - targetSdkVersion 30 + targetSdkVersion 23 } buildTypes { @@ -32,7 +32,7 @@ dependencies { implementation 'com.android.support.constraint:constraint-layout:2.0.4' implementation files('libs\\Msc.jar') implementation "androidx.drawerlayout:drawerlayout:1.1.1" - implementation 'com.android.support:design:29.1.1' + implementation 'com.android.support:design:30.1.1' implementation 'com.zhihu.android:matisse:0.5.2-beta4' implementation 'com.github.bumptech.glide:glide:4.8.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0' diff --git a/src/Notes1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes1/app/build/intermediates/apk/debug/app-debug.apk index bdc1016..cd731da 100644 Binary files a/src/Notes1/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes1/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 8892641..7ddcb72 100644 Binary files a/src/Notes1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 29fdaf0..601f245 100644 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 4e1a291..601f245 100644 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index b1629b9..601f245 100644 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin index 4bd87df..601f245 100644 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin index c894ec1..601f245 100644 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/src/Notes1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 7b50235..bf7ec0f 100644 Binary files a/src/Notes1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex index 75db007..9f3a866 100644 Binary files a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex and b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ diff --git a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex index 0a85e91..b8d0c79 100644 Binary files a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex and b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex differ diff --git a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex index 855fc54..3b62a54 100644 Binary files a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex and b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex differ diff --git a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex index 2e686c5..b3a948e 100644 Binary files a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex and b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex differ diff --git a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex index 7f129d6..80689a9 100644 Binary files a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex and b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex differ diff --git a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex index 6860cae..fc9ce56 100644 Binary files a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex index 223593c..b695386 100644 Binary files a/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex and b/src/Notes1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex differ diff --git a/src/Notes1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index ef97e33..5c11bac 100644 Binary files a/src/Notes1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes1/app/build/intermediates/external_file_lib_dex_archives/debug/0_jetified-Msc.jar b/src/Notes1/app/build/intermediates/external_file_lib_dex_archives/debug/0_jetified-Msc.jar index f08d748..ec30bb4 100644 Binary files a/src/Notes1/app/build/intermediates/external_file_lib_dex_archives/debug/0_jetified-Msc.jar and b/src/Notes1/app/build/intermediates/external_file_lib_dex_archives/debug/0_jetified-Msc.jar differ diff --git a/src/Notes1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/src/Notes1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex index f15eebf..e738143 100644 Binary files a/src/Notes1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex and b/src/Notes1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex differ diff --git a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index f33afea..88c000c 100644 --- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Fri Oct 21 20:28:39 CST 2022 +#Mon Oct 24 20:26:22 CST 2022 net.micode.notes.app-main-20\:/layout/note_edit_list_item.xml=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat net.micode.notes.app-main-20\:/drawable-hdpi/new_note_pressed.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat net.micode.notes.app-main-20\:/drawable-hdpi/selected.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat @@ -6,13 +6,13 @@ net.micode.notes.app-main-20\:/drawable-hdpi/edit_title_red.9.png=D\:\\AndroidTo net.micode.notes.app-main-20\:/raw-zh-rCN/introduction=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat net.micode.notes.app-main-20\:/drawable-hdpi/font_normal.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat net.micode.notes.app-main-20\:/drawable-hdpi/list_white_single.9.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-20\:/menu/note_list.xml=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-20\:/xml/preferences.xml=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat net.micode.notes.app-main-20\:/drawable-hdpi/widget_4x_green.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-20\:/xml/preferences.xml=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-20\:/menu/note_list.xml=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat net.micode.notes.app-main-20\:/layout/folder_list_item.xml=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat net.micode.notes.app-main-20\:/layout/add_account_text.xml=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-20\:/xml/searchable.xml=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat net.micode.notes.app-main-20\:/drawable-hdpi/list_blue_single.9.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-20\:/xml/searchable.xml=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat net.micode.notes.app-main-20\:/drawable-hdpi/list_background.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat net.micode.notes.app-main-20\:/drawable-hdpi/list_red_single.9.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat net.micode.notes.app-main-20\:/drawable-hdpi/font_small.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat diff --git a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml index 4cbd4e4..18164d3 100644 --- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -7,6 +7,33 @@ %1$s 条符合“%2$s”的搜索结果 + "转到主屏幕" + "转到上一层级" + "更多选项" + "完成" + "查看全部" + "选择应用" + "关闭" + "开启" + "Alt+" + "Ctrl+" + "Delete 键" + "Enter 键" + "Fn+" + "Meta+" + "Shift+" + "空格键" + "Sym+" + "Menu+" + "搜索…" + "清除查询" + "搜索查询" + "搜索" + "提交查询" + "语音搜索" + "分享方式" + "使用%s分享" + "收起" 确认删除文件夹及所包含的便签吗？ 确认要删除该条便签吗? 确认要删除所选的 %d 条便签吗? @@ -36,6 +63,7 @@ 请输入名称 已添加到桌面 提醒我 + 更换背景 新建文件夹 删除 取消全选 @@ -47,12 +75,14 @@ 正常 文字大小 小 + 更换字体 超大 进入清单模式 移动到文件夹 上一级文件夹 移动至私密文件夹 退出清单模式 + 私密文件夹 删除提醒 搜索 全选 @@ -64,6 +94,7 @@ 同步 取消同步 选择文件夹 + 回收站 已过期 发送邮件 打开地图 @@ -93,8 +124,10 @@ 便签 搜索便签 正在搜索便签 + "搜索" 便签中的文字 创建提醒 + "999+" 导出成功 与%1$s同步成功 正在获取服务器便签列表... diff --git a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml index 226b5bc..684ff90 100644 --- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -7,6 +7,34 @@ %1$s 條符合”%2$s“的搜尋結果 + "瀏覽首頁" + "向上瀏覽" + "更多選項" + "完成" + "查看全部" + "選擇應用程式" + "關閉" + "開啟" + "Alt +" + "Ctrl +" + "Delete 鍵" + "Enter 鍵" + "Fn +" + "Meta +" + "Shift +" + "空格鍵" + "Sym +" + "Menu +" + "搜尋…" + "清除查詢" + "搜尋查詢" + "搜尋" + "提交查詢" + "語音搜尋" + "選擇分享對象" + "與「%s」分享" + "收合" + 全部 確認刪除檔夾及所包含的便簽嗎？ 确认要删除該條便籤嗎? 确认要刪除所選的 %d 條便籤嗎? @@ -14,19 +42,35 @@ 便簽 便簽2x2 便簽4x4 + 使用(%1$d) + 使用 + 返回 刪除 + 我知道了 + 原圖 + 預覽 + 确定(%1$d) + 确定 通話便籤 取消 設置 成功刪除提醒 + 還沒有圖片或影片 + 不支援的文件類型 + 沒有支持影片預覽的應用程式 不能爲空便籤設置鬧鐘提醒 不能將空便籤發送到桌面 要查看的便籤不存在 + 最多只能選擇 %1$d 個文件 + 您已經達到最大選擇數量 + 圖片質量太高 導出TXT時發生錯誤，請檢查SD卡 SD卡被佔用，不能操作 同步已取消 同步失敗，發生內部錯誤 同步失敗，請檢查網絡和帳號設置 + 不能同時選擇圖片和影片 + 圖片質量太低 導出失敗 文件夾 %1$s 已存在，請重新命名 yyyyMMdd @@ -36,6 +80,7 @@ 請輸入名稱 已添加到桌面 提醒我 + 更换背景 新建文件夾 刪除 取消全選 @@ -47,11 +92,14 @@ 正常 文字大小 小 + 更换字体 超大 進入清單模式 移動到文件夾 上一級文件夾 + 移动至私密文件夹 退出清單模式 + 私密文件夹 刪除提醒 搜尋 全選 @@ -63,6 +111,7 @@ 同步 取消同步 選擇文件夾 + 回收站 已過期 發送郵件 打開地圖 @@ -72,6 +121,7 @@ 知道了 新建便簽 ... + 拍一張 与google task同步便簽記錄 同步賬號 添加賬號 @@ -92,8 +142,10 @@ 便籤 搜索便籤 正在搜索便籤 + "搜尋" 便籤中的文字 創建提醒 + "999+" 導出成功 與%1$s同步成功 正在獲取服務器便籤列表... diff --git a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index 52b1710..70f420c 100644 --- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -1,5 +1,5 @@ - + -%s --%s @@ -10,17 +10,696 @@ Messaging Email + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + false + true + true + @android:color/black + #7fa87f + @android:color/black + @android:color/black + @color/material_deep_teal_200 + @color/material_deep_teal_500 + #1f000000 + #8a000000 + @color/material_grey_800 + @android:color/white + @color/material_grey_850 + @color/material_grey_50 + #80ffffff + #80000000 + @color/bright_foreground_material_light + @color/bright_foreground_material_dark + @android:color/white + @android:color/black + #ff5a595b + #ffd6d7d7 + #FF424242 + #FFFFFFFF + #03000000 + #37000000 + #ff6090 + #e91e63 + #b0003a + #14000000 + #3F51B5 + #303F9F + @android:color/transparent + #14000000 + #44000000 + #0A000000 + #0F000000 + #1AFFFFFF + #2EFFFFFF + #323232 + #80bebebe + #80323232 + #ffbebebe + #ff323232 + #89FFFFFF + #455A64 + #DEFFFFFF + #4DFFFFFF + #34474E + #03A9F4 + #4D03A9F4 + #34474E + #DEFFFFFF + #4DFFFFFF + #FFFFFF + #263237 + #FFFFFF + #37474F + #232E32 + #03A9F4 + #4D03A9F4 + #FFFFFF + #263237 + #1D282C + #ff7043 + #ff5722 + @android:color/white + @android:color/black + #6680cbc4 + #66009688 + #ff37474f + #ff263238 + #ff21272b + #ff80cbc4 + #ff009688 + #fff5f5f5 + #ffe0e0e0 + #fffafafa + #ff757575 + #ff424242 + #ff303030 + #ff212121 + #1F000000 + #61000000 + #00ffffff + #52000000 + #6B000000 + #1F000000 + #0A000000 + #DE000000 + #ffffffff + #ff9e9e9e + #ff424242 + #61FFFFFF + #CC000000 + @android:color/black + @color/material_grey_600 + @color/material_grey_900 + @color/material_grey_100 + #ffffffff + #de000000 + #4Dffffff + #39000000 + #33ffffff + #1f000000 + #b3ffffff + #8a000000 + #36ffffff + #24000000 + #ff616161 + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 + #ff6090 + #e6616161 + #e6FFFFFF #335b5b5b + #999999 + #EAEEF4 + #DE000000 + #4D000000 + #FFFFFF + #0077D9 + #4D0077D9 + #FFFFFF + #DE000000 + #4D000000 + #424242 + #808080 + #1E8AE8 + #FFFFFF + #EAEEF4 + #FFFFFF + #0077D9 + #4D0077D9 + #FFFFFF + #1E8AE8 + #176EB9 + 16dp + 72dp + 56dp + 0dp + 0dp + 4dp + 16dp + 10dp + 6dp + 48dp + 180dp + 5dp + -3dp + 48dp + 48dp + 36dp + 48dp + 48dp + @dimen/abc_control_inset_material + 6dp + 8dp + @dimen/abc_control_padding_material + 720dp + 320dp + 2dp + 4dp + 4dp + 2dp + 80% + 100% + 320dp + 320dp + 8dp + 8dp + 65% + 95% + 24dp + 18dp + 8dp + 0.30 + 0.26 + 32dip + 8dip + 8dip + 7dp + 4dp + 10dp + 16dp + @dimen/abc_action_bar_content_inset_material + 296dp + 4dp + 48dip + 320dip + 2dp + 2dp + 20dp + 3dp + 14sp + 14sp + 14sp + 12sp + 34sp + 45sp + 56sp + 112sp + 24sp + 22sp + 18sp + 14sp + 16sp + 14sp + 16sp + 16dp + 20sp + 20dp + 72dp + 1dp + 2dp + 2dp + 4dp + 6dp + 8dp + 4dp + 2dp + 320dp + 320dp + 10dp + 4dp + 168dp + 96dp + 14sp + 8dp + 56dp + 24dp + 96dp + 56dp + 8dp + 1dp + 12sp + 16dp + 64dp + 0.5dp + 6dp + 24dp + 40dp + 56dp + 6dp + 6dp + 16dp + 32dp + 24dp + 16dp + 32dp + 280dp + 8dp + 8dp + 128dp + 0dp + 6dp + 0dp + -1px + -1px + 12dp + 14dp + 24dp + 14sp + 264dp + 72dp + 14sp + 12sp + 5dp + 0.30 + 0.26 + 8dp + 0dp + 50dp + 0.26 + 0.20 + 0.12 + 0.50 + 0.38 + 0.70 + 0.54 + 20dp + 800dp + 120dp + 48dp + 4dp + 60dp + 5dp + 8dp + 0dp + 56dp + 4dp + 64dp + 0dp + 0dp + 2dp + 2dp + 2dp + 12dp + 8dp + 6dp + 0.07 + 4dp + 16dp + 16dp + 4dp + 6dp + 1dp + 4dp + 8dp + 8dp + 14sp + 0dp + 1dp + 8dp + 3dp + 14sp + 6dp + 2dp + 6dp + 0dp + 22dp + 14dp + 4dp + 8dp + 3dp + 4dp + 0dp + 4dp + 12dp + 1dp + 2dp + 16dp + 56dp + 32dp + 13sp + 12dp + 8dp + 64dp + 64dp + 10dp + @dimen/notification_content_margin_start + 16dp + 2dp + 3dp + 24dp + 13sp + 10dp + 5dp + 18sp + 2dp + 2dp + 2dp + 2dp 26sp 20sp 17sp 14sp 33sp + 2dp + 16dp + 8dp + 8dp + 96dp + 6.5dp + 0dp + 16dp + #3333B5E5 + #0cffffff + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 220 + 150 + 150 + 150 + 127 + 150 + 2 + 300 + 320 + 100 + 100 + 100 + 250 + 200 + 999 %1$s result for \"%2$s\" %1$s results for \"%2$s\" + Navigate home + Navigate up + More options + Done + See all + Choose an app + OFF + ON + sans-serif + sans-serif-medium + sans-serif-medium + sans-serif + sans-serif + sans-serif + sans-serif + sans-serif-light + sans-serif + sans-serif + sans-serif + sans-serif-medium + Alt+ + Ctrl+ + delete + enter + Function+ + Meta+ + Shift+ + space + Sym+ + Menu+ + Search… + Clear query + Search query + Search + Submit query + Voice search + Share with + Share with %s + Collapse + All Media Confirm to delete folder and its notes? Confirm to delete this note? Confirm to delete the selected %d notes? @@ -28,19 +707,43 @@ Notes Notes 2x2 Notes 4x4 + com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior + com.google.android.material.bottomsheet.BottomSheetBehavior + Apply(%1$d) + Apply + Back Delete + OK + Original + Preview + Sure(%1$d) + Sure Call notes + Character limit exceeded %1$d of %2$d + %1$d / %2$d cancel set Delete reminder successfully + No media yet + Unsupported file type + No App found supporting video preview Sorry, can not set clock on empty note Sorry, can not send and empty note to home The note is not exist + You can only select up to %1$d media files + You have reached max selectable + %1$d images over %2$d MB. Original will be unchecked + Can\'t select the images larger than %1$d MB + Over quality 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 + Can\'t select images and videos at the same time + Under quality + com.google.android.material.transformation.FabTransformationScrimBehavior + com.google.android.material.transformation.FabTransformationSheetBehavior Export fail notes_%s.txt /MIUI/notes/ @@ -50,9 +753,11 @@ Export text file (%1$s) to SD (%2$s) directory (%d) Have moved selected %1$d notes to %2$s folder + com.google.android.material.behavior.HideBottomViewOnScrollBehavior Input name Note added to home Remind me + change background New Folder Delete Deselect all @@ -71,6 +776,7 @@ Parent folder Move To Private Folder Leave check list + Private Folder Delete reminder Search Select all @@ -82,6 +788,8 @@ Sync Cancel syncing Select folder + trash folder + Remove %1$s Expired Send email Open map @@ -91,6 +799,12 @@ Got it Add note ... + Show password + M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z + M2,4.27 L19.73,22 L22.27,19.46 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z + M2,4.27 L2,4.27 L4.54,1.73 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z + M3.27,4.27 L19.74,20.74 + Camera Sync notes with google task Sync account Add account @@ -112,8 +826,10 @@ Notes Search notes Searching Notes + Search Text in your notes Set reminder + 999+ Export successful Sync is successful with account %1$s Getting remote note list... @@ -125,47 +841,3947 @@ 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/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 55c3486..33d7f1b 100644 --- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -3692,11 +3692,11 @@ 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 nameMove To Private FolderThe folder %1$s exist, please renameShareSend to homeRemind mebg from photoDelete 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 namefont styleSearching NotesSearch notesText in your notesNotessetcancel + #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 nameMove To Private FolderThe folder %1$s exist, please renameShareSend to homeRemind mechange backgroundPrivate FolderDelete 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 namefont styleSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - Private Folder 短信 邮件 - 便签便签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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签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“的搜尋結果 - 更换背景移动至私密文件夹更换字体私密文件夹 + 移动至私密文件夹更换字体私密文件夹回收站更换背景 diff --git a/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index de182e9..1d620e6 100644 --- a/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,25 +1,4 @@ -#Fri Oct 21 20:33:25 CST 2022 -path.4=13/classes.dex -path.3=12/classes.dex -path.2=11/classes.dex -path.1=0/classes.dex -path.7=5/classes.dex -path.6=4/classes.dex -path.5=15/classes.dex -path.0=classes.dex -base.4=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex -base.3=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex -base.2=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex -base.1=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex -base.0=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex -renamed.3=classes4.dex -renamed.2=classes3.dex -renamed.1=classes2.dex +#Mon Oct 24 20:35:51 CST 2022 +base.0=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex -renamed.7=classes8.dex -renamed.6=classes7.dex -base.7=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex -renamed.5=classes6.dex -base.6=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex -renamed.4=classes5.dex -base.5=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex +path.0=classes.dex diff --git a/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 17ef115..787d9f2 100644 Binary files a/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 534af6e..b763545 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class index 37c051d..db96b8b 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index a78b61a..ac497c9 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index f8d43f4..6661ef1 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index b3144a9..6440097 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class index d254269..80651b8 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 6f8d01a..67b8edc 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 90a5bef..e6667b8 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index a9b342c..983eaa5 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 22c0a81..957188c 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index bb5bf89..965b087 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 52b142e..0632d64 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class index 60e3f92..fd7799f 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class index 2ed834b..d6d8eb3 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class index 5627300..0d12809 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index b3ce8b8..7a27a60 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 1846e58..0e1c1d2 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 4dda63c..0e2c29e 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 1e1f958..682ae66 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 2c59f63..53d3ebe 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 50571a5..95a7384 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 2ee3978..8369809 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 2c32a79..57c97bd 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index df2b4a6..1e76b85 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index 428a267..ab06e17 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 0d71e0a..cb545c4 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index d19187a..9b668c8 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index df16fb1..143e369 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 1176f3d..95eb21a 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 4cef5f1..0ab2ea8 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 877068c..01eab8a 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 106d05c..b8720f5 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index bfc9da3..32b59a1 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index e05e239..10b8eef 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index bb3e09f..71cf687 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index e3c15e7..42c311a 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index fc6795d..b484f9e 100644 --- a/src/Notes1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -21,9 +21,9 @@ 21 22 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:24:5-44 -23 android:minSdkVersion="22" +23 android:minSdkVersion="19" 23-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:24:15-41 -24 android:targetSdkVersion="30" /> +24 android:targetSdkVersion="23" /> 24-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:24:5-44 25 26 @@ -59,261 +59,288 @@ 36 36-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:36:5-81 36-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:36:22-78 -37 -37-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:25:5-80 -37-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:25:22-77 -38 -39 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:38:5-163:19 -40 android:appComponentFactory="androidx.core.app.CoreComponentFactory" -40-->[androidx.core:core:1.3.0] C:\Users\郑皓原\.gradle\caches\transforms-3\cee66f5b2bbb0c67d24ebec1ed60ffe5\transformed\core-1.3.0\AndroidManifest.xml:24:18-86 -41 android:debuggable="true" -42 android:icon="@drawable/icon_app" -42-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:39:9-42 -43 android:label="@string/app_name" -43-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:40:9-41 -44 android:testOnly="true" > -45 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:41:9-54:20 -46 android:name="net.micode.notes.ui.NotesListActivity" -46-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:42:13-49 -47 android:configChanges="keyboardHidden|orientation|screenSize" -47-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:43:13-74 -48 android:label="@string/app_name" -48-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:44:13-45 -49 android:launchMode="singleTop" -49-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:45:13-43 -50 android:theme="@style/NoteTheme" -50-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:46:13-45 -51 android:windowSoftInputMode="adjustPan" > -51-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:48:13-52 -52 -52-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:50:13-53:29 -53 -53-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:51:17-69 -53-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:51:25-66 -54 -55 -55-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:52:17-77 -55-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:52:27-74 -56 -57 -58 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:56:9-85:20 -59 android:name="net.micode.notes.ui.NoteEditActivity" -59-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:57:13-48 -60 android:configChanges="keyboardHidden|orientation|screenSize" -60-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:58:13-74 -61 android:launchMode="singleTop" -61-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:59:13-43 -62 android:theme="@style/NoteTheme" > -62-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:60:13-45 -63 -63-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:62:13-68:29 -63-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:62:28-49 -64 -64-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:64:17-69 -64-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:64:25-66 -65 -66 -66-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:17-76 -66-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:27-73 -67 -68 -68-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:17-78 -68-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:23-75 -69 -69-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:17-78 -69-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:23-75 -70 -71 -71-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:70:13-75:29 -72 -72-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:71:17-79 -72-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:71:25-76 -73 -74 -74-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:17-76 -74-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:27-73 -75 -76 -76-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:17-78 -76-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:23-75 -77 -77-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:17-78 -77-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:23-75 -78 -79 -79-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:77:13-80:29 -80 -80-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:78:17-71 -80-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:78:25-68 -81 -82 -82-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:17-76 -82-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:27-73 -83 +37 +37-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:29:5-83 +37-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:29:22-64 +38 +38-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:38:5-71 +38-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:38:22-68 +39 +39-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:39:5-79 +39-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:39:22-76 +40 +40-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:40:5-76 +40-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:40:22-73 +41 +41-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:41:5-79 +41-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:41:22-76 +42 +42-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:42:5-75 +42-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:42:22-72 +43 +43-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:43:5-80 +43-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:43:22-77 +44 +44-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:26:5-81 +44-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:26:22-78 +45 +45-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:39:5-79 +45-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:39:22-76 +46 +46-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:46:5-47:47 +46-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:46:22-70 +47 +48 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:48:5-173:19 +49 android:appComponentFactory="androidx.core.app.CoreComponentFactory" +49-->[androidx.core:core:1.3.0] C:\Users\郑皓原\.gradle\caches\transforms-3\cee66f5b2bbb0c67d24ebec1ed60ffe5\transformed\core-1.3.0\AndroidManifest.xml:24:18-86 +50 android:debuggable="true" +51 android:icon="@drawable/icon_app" +51-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:49:9-42 +52 android:label="@string/app_name" +52-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:50:9-41 +53 android:testOnly="true" > +54 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:51:9-64:20 +55 android:name="net.micode.notes.ui.NotesListActivity" +55-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:52:13-49 +56 android:configChanges="keyboardHidden|orientation|screenSize" +56-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:53:13-74 +57 android:label="@string/app_name" +57-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:54:13-45 +58 android:launchMode="singleTop" +58-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:55:13-43 +59 android:theme="@style/NoteTheme" +59-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:56:13-45 +60 android:windowSoftInputMode="adjustPan" > +60-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:58:13-52 +61 +61-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:60:13-63:29 +62 +62-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:61:17-69 +62-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:61:25-66 +63 +64 +64-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:62:17-77 +64-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:62:27-74 +65 +66 +67 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:9-95:20 +68 android:name="net.micode.notes.ui.NoteEditActivity" +68-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:67:13-48 +69 android:configChanges="keyboardHidden|orientation|screenSize" +69-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:68:13-74 +70 android:launchMode="singleTop" +70-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:69:13-43 +71 android:theme="@style/NoteTheme" > +71-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:70:13-45 +72 +72-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:72:13-78:29 +72-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:72:28-49 +73 +73-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:74:17-69 +73-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:74:25-66 +74 +75 +75-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:75:17-76 +75-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:75:27-73 +76 +77 +77-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:76:17-78 +77-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:76:23-75 +78 +78-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:76:17-78 +78-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:76:23-75 +79 +80 +80-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:80:13-85:29 +81 +81-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:81:17-79 +81-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:81:25-76 +82 +83 +83-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:75:17-76 +83-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:75:27-73 84 -85 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:82:13-84:54 -86 android:name="android.app.searchable" -86-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:83:17-54 -87 android:resource="@xml/searchable" /> -87-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:84:17-51 -88 -89 -90 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:87:9-96:20 -91 android:name="androidx.core.content.FileProvider" -91-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:89:13-62 -92 android:authorities="com.example.cameraalbumtest.fileprovider" -92-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:88:13-75 -93 android:exported="false" -93-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:90:13-37 -94 android:grantUriPermissions="true" > -94-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:91:13-47 -95 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:92:13-95:19 -96 android:name="android.support.FILE_PROVIDER_PATHS" -96-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:93:17-67 -97 android:resource="@xml/file_paths" /> -97-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:94:17-51 -98 +85 +85-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:76:17-78 +85-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:76:23-75 +86 +86-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:76:17-78 +86-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:76:23-75 +87 +88 +88-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:87:13-90:29 +89 +89-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:88:17-71 +89-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:88:25-68 +90 +91 +91-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:75:17-76 +91-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:75:27-73 +92 +93 +94 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:92:13-94:54 +95 android:name="android.app.searchable" +95-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:93:17-54 +96 android:resource="@xml/searchable" /> +96-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:94:17-51 +97 +98 99 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:97:9-100:43 -100 android:name="net.micode.notes.data.NotesProvider" -100-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:98:13-63 -101 android:authorities="micode_notes" -101-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:99:13-47 -102 android:multiprocess="true" /> -102-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:100:13-40 -103 -104 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:102:9-114:20 -105 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -105-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:103:13-57 -106 android:label="@string/app_widget2x2" > -106-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:104:13-50 -107 -107-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:105:13-109:29 -108 -108-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:106:17-84 -108-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:106:25-81 -109 -109-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:107:17-85 -109-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:107:25-82 -110 -110-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:108:17-85 -110-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:108:25-82 -111 +99-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:97:9-106:20 +100 android:name="androidx.core.content.FileProvider" +100-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:99:13-62 +101 android:authorities="com.example.cameraalbumtest.fileprovider" +101-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:98:13-75 +102 android:exported="false" +102-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:100:13-37 +103 android:grantUriPermissions="true" > +103-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:101:13-47 +104 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:102:13-105:19 +105 android:name="android.support.FILE_PROVIDER_PATHS" +105-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:103:17-67 +106 android:resource="@xml/file_paths" /> +106-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:104:17-51 +107 +108 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:107:9-110:43 +109 android:name="net.micode.notes.data.NotesProvider" +109-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:108:13-63 +110 android:authorities="micode_notes" +110-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:109:13-47 +111 android:multiprocess="true" /> +111-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:110:13-40 112 -113 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:111:13-113:58 -114 android:name="android.appwidget.provider" -114-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:112:17-58 -115 android:resource="@xml/widget_2x_info" /> -115-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:113:17-55 -116 -117 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:115:9-128:20 -118 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -118-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:116:13-57 -119 android:label="@string/app_widget4x4" > -119-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:117:13-50 -120 -120-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:105:13-109:29 -121 -121-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:106:17-84 -121-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:106:25-81 -122 -122-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:107:17-85 -122-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:107:25-82 -123 -123-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:108:17-85 -123-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:108:25-82 -124 -125 -126 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:111:13-113:58 -127 android:name="android.appwidget.provider" -127-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:112:17-58 -128 android:resource="@xml/widget_4x_info" /> -128-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:113:17-55 -129 -130 -130-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:130:9-134:20 -130-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:130:19-55 -131 -131-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:131:13-133:29 -132 -132-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:132:17-79 -132-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:132:25-76 +113 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:112:9-124:20 +114 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +114-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:113:13-57 +115 android:label="@string/app_widget2x2" > +115-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:114:13-50 +116 +116-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:115:13-119:29 +117 +117-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:116:17-84 +117-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:116:25-81 +118 +118-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:117:17-85 +118-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:117:25-82 +119 +119-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:118:17-85 +119-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:118:25-82 +120 +121 +122 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:121:13-123:58 +123 android:name="android.appwidget.provider" +123-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:122:17-58 +124 android:resource="@xml/widget_2x_info" /> +124-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:123:17-55 +125 +126 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:125:9-138:20 +127 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +127-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:126:13-57 +128 android:label="@string/app_widget4x4" > +128-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:127:13-50 +129 +129-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:115:13-119:29 +130 +130-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:116:17-84 +130-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:116:25-81 +131 +131-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:117:17-85 +131-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:117:25-82 +132 +132-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:118:17-85 +132-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:118:25-82 133 -134 -135 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:136:9-139:20 -136 android:name="net.micode.notes.ui.AlarmReceiver" -136-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:137:13-61 -137 android:process=":remote" > -137-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:138:13-38 +134 +135 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:121:13-123:58 +136 android:name="android.appwidget.provider" +136-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:122:17-58 +137 android:resource="@xml/widget_4x_info" /> +137-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:123:17-55 138 -139 -140 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:141:9-146:20 -141 android:name="net.micode.notes.ui.AlarmAlertActivity" -141-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:142:13-50 -142 android:label="@string/app_name" -142-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:143:13-45 -143 android:launchMode="singleInstance" -143-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:144:13-48 -144 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -144-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:145:13-75 -145 -146 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:148:9-153:20 -147 android:name="net.micode.notes.ui.NotesPreferenceActivity" -147-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:149:13-71 -148 android:label="@string/preferences_title" -148-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:150:13-54 -149 android:launchMode="singleTop" -149-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:151:13-43 -150 android:theme="@android:style/Theme.Holo.Light" > -150-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:152:13-60 -151 -152 -153 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:155:9-158:19 -154 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -154-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:156:13-74 -155 android:exported="false" > -155-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:157:13-37 -156 -157 -158 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:160:9-162:52 -159 android:name="android.app.default_searchable" -159-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:161:13-58 -160 android:value=".ui.NoteEditActivity" /> -160-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:162:13-49 +139 +139-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:140:9-144:20 +139-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:140:19-55 +140 +140-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:141:13-143:29 +141 +141-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:142:17-79 +141-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:142:25-76 +142 +143 +144 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:146:9-149:20 +145 android:name="net.micode.notes.ui.AlarmReceiver" +145-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:147:13-61 +146 android:process=":remote" > +146-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:148:13-38 +147 +148 +149 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:151:9-156:20 +150 android:name="net.micode.notes.ui.AlarmAlertActivity" +150-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:152:13-50 +151 android:label="@string/app_name" +151-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:153:13-45 +152 android:launchMode="singleInstance" +152-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:154:13-48 +153 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +153-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:155:13-75 +154 +155 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:158:9-163:20 +156 android:name="net.micode.notes.ui.NotesPreferenceActivity" +156-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:159:13-71 +157 android:label="@string/preferences_title" +157-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:160:13-54 +158 android:launchMode="singleTop" +158-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:161:13-43 +159 android:theme="@android:style/Theme.Holo.Light" > +159-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:162:13-60 +160 161 -162 -162-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:28:9-73 -162-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:28:19-70 -163 -163-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:29:9-87 -163-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:29:19-84 -164 -164-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:30:9-90 -164-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:30:19-87 -165 [com.simple:spiderman:1.0.2] C:\Users\郑皓原\.gradle\caches\transforms-3\664fec32197f5d501092b24143f17a57\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:12:9-16:20 -166 android:name="com.simple.spiderman.CrashActivity" -166-->[com.simple:spiderman:1.0.2] C:\Users\郑皓原\.gradle\caches\transforms-3\664fec32197f5d501092b24143f17a57\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:13:13-62 -167 android:launchMode="singleInstance" -167-->[com.simple:spiderman:1.0.2] C:\Users\郑皓原\.gradle\caches\transforms-3\664fec32197f5d501092b24143f17a57\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:14:13-48 -168 android:theme="@style/AppTheme" > -168-->[com.simple:spiderman:1.0.2] C:\Users\郑皓原\.gradle\caches\transforms-3\664fec32197f5d501092b24143f17a57\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:15:13-44 -169 -170 -171 -172 +162 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:165:9-168:19 +163 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +163-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:166:13-74 +164 android:exported="false" > +164-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:167:13-37 +165 +166 +167 D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:170:9-172:52 +168 android:name="android.app.default_searchable" +168-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:171:13-58 +169 android:value=".ui.NoteEditActivity" /> +169-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:172:13-49 +170 +171 +171-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:28:9-73 +171-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:28:19-70 +172 +172-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:29:9-87 +172-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:29:19-84 +173 +173-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:30:9-90 +173-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\郑皓原\.gradle\caches\transforms-3\7af08be3f710e921c81a418a8516de04\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:30:19-87 +174 [com.simple:spiderman:1.0.2] C:\Users\郑皓原\.gradle\caches\transforms-3\664fec32197f5d501092b24143f17a57\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:12:9-16:20 +175 android:name="com.simple.spiderman.CrashActivity" +175-->[com.simple:spiderman:1.0.2] C:\Users\郑皓原\.gradle\caches\transforms-3\664fec32197f5d501092b24143f17a57\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:13:13-62 +176 android:launchMode="singleInstance" +176-->[com.simple:spiderman:1.0.2] C:\Users\郑皓原\.gradle\caches\transforms-3\664fec32197f5d501092b24143f17a57\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:14:13-48 +177 android:theme="@style/AppTheme" > +177-->[com.simple:spiderman:1.0.2] C:\Users\郑皓原\.gradle\caches\transforms-3\664fec32197f5d501092b24143f17a57\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:15:13-44 +178 +179 +180 +181 diff --git a/src/Notes1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 0e7d533..ccb10c0 100644 --- a/src/Notes1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/Notes1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="19" + android:targetSdkVersion="23" /> @@ -34,7 +34,16 @@ + + + + + + + + + + android:minSdkVersion="19" + android:targetSdkVersion="23" /> @@ -34,7 +34,16 @@ + + + + + + + + + + android:minSdkVersion="19" + android:targetSdkVersion="23" /> @@ -34,7 +34,16 @@ + + + + + + + + + - + @@ -34,7 +34,17 @@ - + + + + + + + + + + diff --git a/src/Notes1/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes1/app/src/main/java/net/micode/notes/data/Notes.java index f240604..d4cfd87 100644 --- a/src/Notes1/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/Notes1/app/src/main/java/net/micode/notes/data/Notes.java @@ -165,6 +165,7 @@ public class Notes { *

Type : INTEGER (long)

*/ public static final String VERSION = "version"; + public static final String GROUP = "group_num"; } public interface DataColumns { diff --git a/src/Notes1/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes1/app/src/main/java/net/micode/notes/tool/DataUtils.java index 598c792..0b26ec9 100644 --- a/src/Notes1/app/src/main/java/net/micode/notes/tool/DataUtils.java +++ b/src/Notes1/app/src/main/java/net/micode/notes/tool/DataUtils.java @@ -84,6 +84,7 @@ public class DataUtils { long folderId) { if (ids == null) { Log.d(TAG, "the ids is null"); + return true; } diff --git a/src/Notes1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 611d821..7205084 100644 --- a/src/Notes1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -20,6 +20,7 @@ import android.Manifest; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; +import android.app.Person; import android.appwidget.AppWidgetManager; import android.content.AsyncQueryHandler; import android.content.ContentResolver; @@ -73,6 +74,7 @@ import android.widget.Toast; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; import net.micode.notes.R; import net.micode.notes.data.Notes; @@ -97,9 +99,9 @@ import java.io.FileInputStream; import java.io.FileOutputStream; public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { - private int time_node = 0; + private int time_mode = 0; private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; - + private Uri uri; private static final int FOLDER_LIST_QUERY_TOKEN = 1; private static final int MENU_FOLDER_DELETE = 0; @@ -175,6 +177,18 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt context = NotesListActivity.this; switch (requestCode) { case 1: + if (resultCode == RESULT_OK) { + try { + Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri)); + Drawable drawable = new BitmapDrawable(bitmap); + //Toast.makeText(context, " to get image chuxian", Toast.LENGTH_SHORT).show(); + getWindow().setBackgroundDrawable(drawable); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + } + break; + case 3: if (resultCode == RESULT_OK) { if (Build.VERSION.SDK_INT >= 19) { handeImage(data); @@ -376,10 +390,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt case R.id.move: startQueryDestinationFolders(); break; - case R.id.menu_bg_photo: - time_node=1; - bg_from_photo(); - break; + default: return false; } @@ -454,7 +465,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt : NORMAL_SELECTION; mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { - String.valueOf(mCurrentFolderId) + String.valueOf(mCurrentFolderId) }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } @@ -517,12 +528,22 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt 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"); + if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ + // if in trash, delete notes directly + if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter + .getSelectedItemIds())) { + } else { + Log.e(TAG, "Delete notes error, should not happens"); + } } + else{ + //move to trash + if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter + .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) { + Log.e(TAG, "Move notes to trash folder error, should not happens"); + } + } + } else { // in sync mode, we'll move the deleted note into the trash // folder @@ -893,8 +914,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt ResetPassword(); break; } - case R.id.menu_bg_photo:{ - bg_from_photo(); + case R.id.menu_bg_change:{ + showListDialog(); + break; + } + case R.id.menu_trash_folder:{ + restoreDeletedNodes(); break; } default: @@ -909,6 +934,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } + private void restoreDeletedNodes(){ + mState = ListEditState.SUB_FOLDER; + mCurrentFolderId = Notes.ID_TRASH_FOLER; + startAsyncNotesListQuery(); + mTitleBar.setText("回收站"); + mTitleBar.setVisibility(View.VISIBLE); + } + private void exportNoteToText() { final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this); new AsyncTask() { @@ -1180,6 +1213,26 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } return false; } + public void bg_from_camera() { + context = NotesListActivity.this; + File file = new File(getExternalCacheDir(), "test.jpg"); + try { + if (file.exists()) { + file.delete(); + } + file.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + if (Build.VERSION.SDK_INT >= 24) { + uri = FileProvider.getUriForFile(context, "com.example.cameraalbumtest.fileprovider", file); + } else { + uri = Uri.fromFile(file); + } + Intent intent = new Intent("android.media.action.IMAGE_CAPTURE"); + intent.putExtra(MediaStore.EXTRA_OUTPUT, uri); + startActivityForResult(intent, 1); + } public void bg_from_photo() { context = NotesListActivity.this; @@ -1241,7 +1294,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt if (path != null) { Bitmap bitmap = BitmapFactory.decodeFile(path); //imageView.setImageBitmap(bitmap); - Drawable drawable = new BitmapDrawable(bitmap); + Drawable drawable = new BitmapDrawable(getResources(),bitmap); Toast.makeText(context, " 获取图片", Toast.LENGTH_SHORT).show(); getWindow().setBackgroundDrawable(drawable); } else { @@ -1249,5 +1302,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - + public void showListDialog() { + final String[] items = {"从相册选取", "拍摄照片"}; + AlertDialog.Builder listDialog = new AlertDialog.Builder(NotesListActivity.this); + listDialog.setTitle("背景"); + listDialog.setItems(items, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + switch(i){ + case 0: + time_mode = 3; + bg_from_photo(); + break; + case 1: + time_mode = 2; + bg_from_camera(); + break; + default: + break; + } + } + }); + listDialog.show(); + } } diff --git a/src/Notes1/app/src/main/res/menu/note_edit.xml b/src/Notes1/app/src/main/res/menu/note_edit.xml index 9a92558..9a1f847 100644 --- a/src/Notes1/app/src/main/res/menu/note_edit.xml +++ b/src/Notes1/app/src/main/res/menu/note_edit.xml @@ -55,5 +55,5 @@ + android:title="移动到私密文件夹" /> \ No newline at end of file diff --git a/src/Notes1/app/src/main/res/menu/note_list.xml b/src/Notes1/app/src/main/res/menu/note_list.xml index 8739ac5..b1a1f81 100644 --- a/src/Notes1/app/src/main/res/menu/note_list.xml +++ b/src/Notes1/app/src/main/res/menu/note_list.xml @@ -39,8 +39,11 @@ + android:title="私密文件夹"/> + android:id="@+id/menu_bg_change" + android:title="更换背景"/> + diff --git a/src/Notes1/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes1/app/src/main/res/values-zh-rCN/strings.xml index 9c1aff3..be15331 100644 --- a/src/Notes1/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/Notes1/app/src/main/res/values-zh-rCN/strings.xml @@ -58,6 +58,7 @@ 查看文件夹 刪除文件夹 修改文件夹名称 + 回收站 文件夹 %1$s 已存在，请重新命名 分享 @@ -124,7 +125,7 @@ %1$s 条符合“%2$s”的搜索结果 更换字体 - 更换背景 移动至私密文件夹 私密文件夹 + 更换背景 diff --git a/src/Notes1/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes1/app/src/main/res/values-zh-rTW/strings.xml index 2c59ed2..24c0933 100644 --- a/src/Notes1/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/Notes1/app/src/main/res/values-zh-rTW/strings.xml @@ -123,9 +123,10 @@ %1$s 條符合”%2$s“的搜尋結果 - 更换背景 移动至私密文件夹 更换字体 私密文件夹 + 回收站 + 更换背景 diff --git a/src/Notes1/app/src/main/res/values/strings.xml b/src/Notes1/app/src/main/res/values/strings.xml index c9a63d2..f361bf6 100644 --- a/src/Notes1/app/src/main/res/values/strings.xml +++ b/src/Notes1/app/src/main/res/values/strings.xml @@ -67,9 +67,11 @@ Share Send to home Remind me - bg from photo + change background Private Folder Delete reminder + + Select folder Parent folder Note added to home @@ -133,5 +135,6 @@ %1$s results for \"%2$s\" + trash folder