From a22cc82f5bbd516a887d9aad92f551e68c52d88c Mon Sep 17 00:00:00 2001
From: Morningstar <364080773@qq.com>
Date: Wed, 17 Apr 2024 08:32:34 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=81=E5=AF=86?=
=?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../micode/notes/ui/NotesListActivity.java | 85 +++++++++++++++++--
MiNote/app/src/main/res/menu/note_list.xml | 9 ++
MiNote/app/src/main/res/menu/sub_folder.xml | 8 ++
.../src/main/res/values-zh-rCN/strings.xml | 2 +
.../src/main/res/values-zh-rTW/strings.xml | 2 +
MiNote/app/src/main/res/values/strings.xml | 2 +
6 files changed, 103 insertions(+), 5 deletions(-)
diff --git a/MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 77a30b8..11cfd3d 100644
--- a/MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -93,6 +93,8 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction";
+ public static int secret_mode = 0;
+
private enum ListEditState {
NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
};
@@ -413,10 +415,35 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
private void startAsyncNotesListQuery() {
String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
: NORMAL_SELECTION;
- mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
- Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
- String.valueOf(mCurrentFolderId)
- }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+ if(secret_mode == 0) {
+ mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+ Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{
+ String.valueOf(mCurrentFolderId)
+ }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+ }
+ else{
+ String str1 = "11111";
+ String [] PROJECTION = new String [] { //定义一个新的PROJECTION数组，只换掉SNIPPET
+ NoteColumns.ID,
+ NoteColumns.ALERTED_DATE,
+ NoteColumns.BG_COLOR_ID,
+ NoteColumns.CREATED_DATE,
+ NoteColumns.HAS_ATTACHMENT,
+ NoteColumns.MODIFIED_DATE,
+ NoteColumns.NOTES_COUNT,
+ NoteColumns.PARENT_ID,
+// NoteColumns.SNIPPET,
+ str1,
+ NoteColumns.TYPE,
+ NoteColumns.WIDGET_ID,
+ NoteColumns.WIDGET_TYPE,
+ };
+ mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+ Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{
+ String.valueOf(mCurrentFolderId)
+ }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+
+ }
}
private final class BackgroundQueryHandler extends AsyncQueryHandler {
@@ -765,8 +792,13 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
menu.clear();
+
if (mState == ListEditState.NOTE_LIST) {
getMenuInflater().inflate(R.menu.note_list, menu);
+ if (secret_mode == 1)
+ menu.findItem(R.id.menu_secret).setVisible(false);
+ else
+ menu.findItem(R.id.menu_quit_secret).setVisible(false);
// set sync or sync_cancel
menu.findItem(R.id.menu_sync).setTitle(
GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync);
@@ -811,9 +843,52 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
createNewNote();
break;
}
- case R.id.menu_search:
+ case R.id.menu_search: {
onSearchRequested();
break;
+ }
+ case R.id.menu_secret: { //进入私密模式
+ secret_mode = 1;
+ AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
+ dialog.setTitle("重要提醒");
+ dialog.setMessage("您确认进入私密模式吗？");
+ dialog.setCancelable(false);
+ dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ startAsyncNotesListQuery();
+ Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
+ }
+ });
+ dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which){}
+ });
+ dialog.show();
+ startAsyncNotesListQuery();
+ Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
+ break;
+ }
+ case R.id.menu_quit_secret:{ //退出私密模式
+ secret_mode = 0;
+ AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
+ dialog.setTitle("重要提醒");
+ dialog.setMessage("您确认退出私密模式吗？");
+ dialog.setCancelable(false);
+ dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ startAsyncNotesListQuery();
+ Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show();
+ }
+ });
+ dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which){}
+ });
+ dialog.show();
+ break;
+ }
default:
break;
}
diff --git a/MiNote/app/src/main/res/menu/note_list.xml b/MiNote/app/src/main/res/menu/note_list.xml
index 42ea736..69461b2 100644
--- a/MiNote/app/src/main/res/menu/note_list.xml
+++ b/MiNote/app/src/main/res/menu/note_list.xml
@@ -36,4 +36,13 @@