diff --git a/src/Notes-master1/.gradle/7.5/checksums/checksums.lock b/src/Notes-master1/.gradle/7.5/checksums/checksums.lock index 409fd8d3..70ff0f80 100644 Binary files a/src/Notes-master1/.gradle/7.5/checksums/checksums.lock and b/src/Notes-master1/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin index 98673e5e..5abd26e1 100644 Binary files a/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin and b/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin index ed29176b..2a46ecdc 100644 Binary files a/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin and b/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin index c0a7520d..07682d45 100644 Binary files a/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock index c2f30934..d3b1d3de 100644 Binary files a/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin index e0aded85..4ac44a22 100644 Binary files a/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock index e868552e..0dbc8daf 100644 Binary files a/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin index 16c04889..abddf695 100644 Binary files a/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 0d07d784..d075f9a3 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin index a4564e39..c9738b32 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe index f1e925d5..eace7ab1 100644 Binary files a/src/Notes-master1/.gradle/file-system.probe and b/src/Notes-master1/.gradle/file-system.probe differ diff --git a/src/Notes-master1/app/build.gradle b/src/Notes-master1/app/build.gradle index a0df5415..73e49403 100644 --- a/src/Notes-master1/app/build.gradle +++ b/src/Notes-master1/app/build.gradle @@ -26,7 +26,14 @@ android { packagingOptions{ exclude 'META-INF/DEPENDENCIES' } + buildFeatures { + viewBinding true + } + +} +dependencies { + implementation 'com.android.support:appcompat-v7:22.+' } diff --git a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk index d71b23ec..d08e74bb 100644 Binary files a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index e2f04c1c..44b9f004 100644 Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 274fe1c2..abf9e94d 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 406488dd..299e455d 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index 7fb4c424..7309d172 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin index dfcd56e8..63af0ebf 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin index a8e0777f..eb5a9aab 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex index dc47d0c1..e865b6b3 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex index e987c657..a2d6eeb6 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex index 691dbaa1..b5f6cd2e 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex index 2cb3542f..70931f6f 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex index 7cfd2020..9c72f326 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index eecce6d7..c0edbeed 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 0b7e2d1c..ae839711 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Tue Jun 06 14:58:28 ULAT 2023 +#Tue Jun 06 19:30:40 ULAT 2023 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat @@ -13,8 +13,8 @@ net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\gitProject1\\src\\Not net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat @@ -64,6 +64,7 @@ net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=E\:\\gitProj net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/background0.jpg=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_background0.jpg.flat net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat @@ -72,6 +73,7 @@ net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\gitProject1\\ net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/background1.jpg=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_background1.jpg.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index 5644c1fe..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗? - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 登录失败 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误,请检查SD卡 - SD卡被占用,不能操作 - 同步已取消 - 同步失败,发生内部错误 - 同步失败,请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在,请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 输入为空 - 登录 - 账号 - 密码 - 注册 - 请登录 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - - 正常 - 文字大小 - - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项,操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复 - 请选择google帐号,便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中,不能修改同步帐号 - 同步帐号已设置为%1$s - 注册成功 - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容,点击新建便签。 - 访客模式下,便签内容不可见 - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 95812f27..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎? - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 登录失败 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤,請檢查SD卡 - SD卡被佔用,不能操作 - 同步已取消 - 同步失敗,發生內部錯誤 - 同步失敗,請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在,請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 输入为空 - 登录 - 账号 - 密码 - 注册 - 请登录 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - - 正常 - 文字大小 - - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項,操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復 - 請選擇google帳號,便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中,不能修改同步帳號 - 同步帳號已設置為%1$s - 注册成功 - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容,點擊新建便簽。 - 訪客模式下,便籤內容不可見 - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index 0735c4e8..8fb4b27b 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -60,6 +60,8 @@ register Please login in Remind me + background0 + background1 New Folder Delete Deselect all diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 18149f5f..9b663a36 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -11,7 +11,7 @@ %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + + + @@ -65,4 +69,13 @@ + + + + \ No newline at end of file diff --git a/src/Notes-master1/caches/7.5/executionHistory/executionHistory.bin b/src/Notes-master1/caches/7.5/executionHistory/executionHistory.bin index e1d6c858..d8eef995 100644 Binary files a/src/Notes-master1/caches/7.5/executionHistory/executionHistory.bin and b/src/Notes-master1/caches/7.5/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/caches/7.5/executionHistory/executionHistory.lock b/src/Notes-master1/caches/7.5/executionHistory/executionHistory.lock index 8f1bc926..35b0dea2 100644 Binary files a/src/Notes-master1/caches/7.5/executionHistory/executionHistory.lock and b/src/Notes-master1/caches/7.5/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/caches/7.5/fileHashes/fileHashes.bin b/src/Notes-master1/caches/7.5/fileHashes/fileHashes.bin index 3516063c..70c4eba1 100644 Binary files a/src/Notes-master1/caches/7.5/fileHashes/fileHashes.bin and b/src/Notes-master1/caches/7.5/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/caches/7.5/fileHashes/fileHashes.lock b/src/Notes-master1/caches/7.5/fileHashes/fileHashes.lock index 25a95d2c..f811342f 100644 Binary files a/src/Notes-master1/caches/7.5/fileHashes/fileHashes.lock and b/src/Notes-master1/caches/7.5/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/caches/7.5/javaCompile/classAnalysis.bin b/src/Notes-master1/caches/7.5/javaCompile/classAnalysis.bin index cf241e9e..dd467abb 100644 Binary files a/src/Notes-master1/caches/7.5/javaCompile/classAnalysis.bin and b/src/Notes-master1/caches/7.5/javaCompile/classAnalysis.bin differ diff --git a/src/Notes-master1/caches/7.5/javaCompile/jarAnalysis.bin b/src/Notes-master1/caches/7.5/javaCompile/jarAnalysis.bin index 4b037c3a..232365af 100644 Binary files a/src/Notes-master1/caches/7.5/javaCompile/jarAnalysis.bin and b/src/Notes-master1/caches/7.5/javaCompile/jarAnalysis.bin differ diff --git a/src/Notes-master1/caches/7.5/javaCompile/javaCompile.lock b/src/Notes-master1/caches/7.5/javaCompile/javaCompile.lock index 842c9172..354e2936 100644 Binary files a/src/Notes-master1/caches/7.5/javaCompile/javaCompile.lock and b/src/Notes-master1/caches/7.5/javaCompile/javaCompile.lock differ diff --git a/src/Notes-master1/caches/7.5/md-rule/md-rule.lock b/src/Notes-master1/caches/7.5/md-rule/md-rule.lock index 4f7247dd..8ffb5dd3 100644 Binary files a/src/Notes-master1/caches/7.5/md-rule/md-rule.lock and b/src/Notes-master1/caches/7.5/md-rule/md-rule.lock differ diff --git a/src/Notes-master1/caches/journal-1/file-access.bin b/src/Notes-master1/caches/journal-1/file-access.bin index c9e41cc0..19c57baa 100644 Binary files a/src/Notes-master1/caches/journal-1/file-access.bin and b/src/Notes-master1/caches/journal-1/file-access.bin differ diff --git a/src/Notes-master1/caches/journal-1/journal-1.lock b/src/Notes-master1/caches/journal-1/journal-1.lock index f26d7ad3..c819cd5b 100644 Binary files a/src/Notes-master1/caches/journal-1/journal-1.lock and b/src/Notes-master1/caches/journal-1/journal-1.lock differ diff --git a/src/Notes-master1/caches/modules-2/metadata-2.99/module-artifact.bin b/src/Notes-master1/caches/modules-2/metadata-2.99/module-artifact.bin index 551b421e..346c274b 100644 Binary files a/src/Notes-master1/caches/modules-2/metadata-2.99/module-artifact.bin and b/src/Notes-master1/caches/modules-2/metadata-2.99/module-artifact.bin differ diff --git a/src/Notes-master1/caches/modules-2/metadata-2.99/module-artifacts.bin b/src/Notes-master1/caches/modules-2/metadata-2.99/module-artifacts.bin index a9c679ae..fadeb870 100644 Binary files a/src/Notes-master1/caches/modules-2/metadata-2.99/module-artifacts.bin and b/src/Notes-master1/caches/modules-2/metadata-2.99/module-artifacts.bin differ diff --git a/src/Notes-master1/caches/modules-2/metadata-2.99/module-metadata.bin b/src/Notes-master1/caches/modules-2/metadata-2.99/module-metadata.bin index 31f91934..fcb56656 100644 Binary files a/src/Notes-master1/caches/modules-2/metadata-2.99/module-metadata.bin and b/src/Notes-master1/caches/modules-2/metadata-2.99/module-metadata.bin differ diff --git a/src/Notes-master1/caches/modules-2/metadata-2.99/resource-at-url.bin b/src/Notes-master1/caches/modules-2/metadata-2.99/resource-at-url.bin index 601a2162..34fde69c 100644 Binary files a/src/Notes-master1/caches/modules-2/metadata-2.99/resource-at-url.bin and b/src/Notes-master1/caches/modules-2/metadata-2.99/resource-at-url.bin differ diff --git a/src/Notes-master1/caches/modules-2/modules-2.lock b/src/Notes-master1/caches/modules-2/modules-2.lock index 0d26011d..d3a616ac 100644 Binary files a/src/Notes-master1/caches/modules-2/modules-2.lock and b/src/Notes-master1/caches/modules-2/modules-2.lock differ diff --git a/src/Notes-master1/daemon/7.5/registry.bin b/src/Notes-master1/daemon/7.5/registry.bin index e33eb3bd..1569ff7d 100644 Binary files a/src/Notes-master1/daemon/7.5/registry.bin and b/src/Notes-master1/daemon/7.5/registry.bin differ diff --git a/src/Notes-master1/daemon/7.5/registry.bin.lock b/src/Notes-master1/daemon/7.5/registry.bin.lock index 32d650b3..a582e652 100644 Binary files a/src/Notes-master1/daemon/7.5/registry.bin.lock and b/src/Notes-master1/daemon/7.5/registry.bin.lock differ diff --git a/src/Notes-master1/gradle.properties b/src/Notes-master1/gradle.properties index 2a40a303..668b6a86 100644 --- a/src/Notes-master1/gradle.properties +++ b/src/Notes-master1/gradle.properties @@ -10,7 +10,7 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -#Tue Jun 06 15:00:36 ULAT 2023 +#Tue Jun 06 19:33:40 ULAT 2023 systemProp.http.proxyHost= systemProp.https.proxyHost= systemProp.https.proxyPort=80