From 814967bce3d3af72f205b41759d92949de3d3ec0 Mon Sep 17 00:00:00 2001 From: lyy <627219260@qq.com> Date: Sat, 4 May 2024 19:28:10 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 85eea4ea723fa73710d5701100a3ae31dd534b14 Merge: e386d33 4d298a1 Author: lyy <627219260@qq.com> Date: Sat May 4 19:26:26 2024 +0800 Merge branch 'develop' of https://bdgit.educoder.net/p82fie9y6/Notes-master into text commit e386d33ba0f124ab59c233ad6b4a75257cdc583c Author: lyy <627219260@qq.com> Date: Sat May 4 19:24:25 2024 +0800 Squashed commit of the following: commit 4d298a1d1c835fa7e5003b123321f0272960ae23 Author: lyy <627219260@qq.com> Date: Fri Apr 26 14:25:39 2024 +0800 精读 commit c8e65c4496b44ae756af468ce57e11cbbc02ddf6 Author: lyy <627219260@qq.com> Date: Sat May 4 19:11:11 2024 +0800 打开回收站 commit 9816a0b8b87cca77562e509240353da9e0ac46d7 Author: lyy <627219260@qq.com> Date: Sat May 4 15:34:56 2024 +0800 在非回收站处删除便签时，移入回收站；在回收站删除便签时，彻底删除 在主页面菜单里提供“Recycle Bin”选项，允许用户进入回收站 --- .../micode/notes/ui/NotesListActivity.java | 30 ++++++++++++++----- src/app/src/main/res/menu/note_list.xml | 5 ++-- .../src/main/res/values-zh-rCN/strings.xml | 1 + src/app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 0cf9f19..e72bea7 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -474,16 +474,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt new AsyncTask>() { protected HashSet doInBackground(Void... unused) { HashSet widgets = mNotesListAdapter.getSelectedWidget(); - if (!isSyncMode()) { - // if not synced, delete notes directly + if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ + // if in trash, really delete notes if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter .getSelectedItemIds())) { } else { Log.e(TAG, "Delete notes error, should not happens"); } } else { - // in sync mode, we'll move the deleted note into the trash - // folder + // move notes to trash if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) { Log.e(TAG, "Move notes to trash folder error, should not happens"); @@ -517,11 +516,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt ids.add(folderId); HashSet widgets = DataUtils.getFolderNoteWidget(mContentResolver, folderId); - if (!isSyncMode()) { - // if not synced, delete folder directly + if (mCurrentFolderId == Notes.ID_TRASH_FOLER) { + // if in trash, delete folder directly DataUtils.batchDeleteNotes(mContentResolver, ids); } else { - // in sync mode, we'll move the deleted folder into the trash folder + //move the deleted folder into the trash folder DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER); } if (widgets != null) { @@ -813,12 +812,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt case R.id.menu_search: onSearchRequested(); break; + case R.id.menu_trash: + openTrashFolder(); + break; default: break; } return true; } - + private void openTrashFolder() { + // 将当前列表的编辑状态设置为子文件夹模式 + mState = ListEditState.SUB_FOLDER; + // 将当前文件夹 ID 设置为垃圾箱的 ID + mCurrentFolderId = Notes.ID_TRASH_FOLER; + startAsyncNotesListQuery(); + // 不显示底部的“写便签” + mAddNewNote.setVisibility(View.GONE); + // 将顶部栏设置为 data.getSnippet 文件夹名称 + mTitleBar.setText(NotesListActivity.this + .getString(R.string.menu_trash)); + mTitleBar.setVisibility(View.VISIBLE); + } @Override public boolean onSearchRequested() { startSearch(null, false, null /* appData */, false); diff --git a/src/app/src/main/res/menu/note_list.xml b/src/app/src/main/res/menu/note_list.xml index 42ea736..9a7c51d 100644 --- a/src/app/src/main/res/menu/note_list.xml +++ b/src/app/src/main/res/menu/note_list.xml @@ -33,7 +33,8 @@ android:id="@+id/menu_setting" android:title="@string/menu_setting" /> + + android:id="@+id/menu_trash" + android:title="@string/menu_trash"/> diff --git a/src/app/src/main/res/values-zh-rCN/strings.xml b/src/app/src/main/res/values-zh-rCN/strings.xml index 09f75ed..927bb9a 100644 --- a/src/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/app/src/main/res/values-zh-rCN/strings.xml @@ -110,6 +110,7 @@ 正在同步中，不能修改同步帐号 同步帐号已设置为%1$s 新建便签背景颜色随机 + 回收站 删除 通话便签 请输入名称 diff --git a/src/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml index 55df868..f2a561f 100644 --- a/src/app/src/main/res/values/strings.xml +++ b/src/app/src/main/res/values/strings.xml @@ -116,6 +116,8 @@ %1$s has been set as the sync account New note background color random + Trash Folder + Delete Call notes Input name