From 00010a1411a863ac094b5a280c16832eed085427 Mon Sep 17 00:00:00 2001
From: xuningshuo <2105361900@qq.com>
Date: Thu, 29 Jan 2026 15:57:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E6=94=B9=E5=8F=98?=
=?UTF-8?q?=E4=BE=BF=E7=AD=BE=E6=8E=92=E5=88=97=E6=A0=BC=E5=BC=8F=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=EF=BC=8C=E8=A1=A5=E5=85=85=E4=BA=86=E5=9B=9E=E6=94=B6?=
=?UTF-8?q?=E7=AB=99=E6=9C=AA=E6=88=90=E5=8A=9F=E4=B8=8A=E4=BC=A0=E7=9A=84?=
=?UTF-8?q?xml=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
res/layout/note_edit.xml | 2 +
res/layout/note_list.xml | 15 ++++
res/menu/note_list.xml | 4 +
res/menu/trash_folder.xml | 32 +++++++
res/menu/trash_list_options.xml | 29 +++++++
res/values/strings.xml | 148 --------------------------------
src/ui/NoteEditActivity.java | 1 +
src/ui/NotesListActivity.java | 31 +++++++
8 files changed, 114 insertions(+), 148 deletions(-)
create mode 100644 res/menu/trash_folder.xml
create mode 100644 res/menu/trash_list_options.xml
delete mode 100644 res/values/strings.xml
diff --git a/res/layout/note_edit.xml b/res/layout/note_edit.xml
index 115e6b7..a259e1d 100644
--- a/res/layout/note_edit.xml
+++ b/res/layout/note_edit.xml
@@ -250,6 +250,8 @@
+
+
+
+
+ - %1$s 条符合"%2$s"的搜索结果
-
- - %1$s 条符合"%2$s"的搜索结果
-
-
-
- 清空回收站
- 确认要清空回收站中的所有便签吗？此操作不可恢复。
- 已恢复 %d 条便签
- 回收站已清空
-
-
diff --git a/src/ui/NoteEditActivity.java b/src/ui/NoteEditActivity.java
index e26ac68..1260e87 100644
--- a/src/ui/NoteEditActivity.java
+++ b/src/ui/NoteEditActivity.java
@@ -451,6 +451,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
View view = findViewById(id);
view.setOnClickListener(this);
};//对字体大小的选择
+
mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
/**
diff --git a/src/ui/NotesListActivity.java b/src/ui/NotesListActivity.java
index d8da8d5..51a37c9 100644
--- a/src/ui/NotesListActivity.java
+++ b/src/ui/NotesListActivity.java
@@ -39,6 +39,7 @@ import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemLongClickListener;
import android.widget.Button;
import android.widget.EditText;
+import android.widget.GridView;
import android.widget.ListView;
import android.widget.PopupMenu;
import android.widget.TextView;
@@ -91,6 +92,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private ListView mNotesListView;
+ private GridView mNotesGridView;
+
private Button mAddNewNote;
private boolean mDispatch;
@@ -115,6 +118,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private NoteItemData mFocusNoteDataItem;
+ private boolean mIsGridMode = false; // 是否为九宫格模式
+
private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?";
private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>"
@@ -234,6 +239,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mNotesListView.setOnItemLongClickListener(this);
mNotesListAdapter = new NotesListAdapter(this);
mNotesListView.setAdapter(mNotesListAdapter);
+
+ // 初始化GridView
+ mNotesGridView = (GridView) findViewById(R.id.notes_grid);
+ mNotesGridView.setOnItemClickListener(new OnListItemClickListener());
+ mNotesGridView.setOnItemLongClickListener(this);
+ mNotesGridView.setAdapter(mNotesListAdapter);
+
mAddNewNote = (Button) findViewById(R.id.btn_new_note);// 在activity中要获取该按钮
mAddNewNote.setOnClickListener(this);
mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
@@ -880,6 +892,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
toggleDarkMode();
break;
}
+ case R.id.menu_layout_mode: {
+ toggleLayoutMode();
+ break;
+ }
case R.id.menu_sync: {
if (isSyncMode()) {
if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) {
@@ -1052,6 +1068,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
}
+ private void toggleLayoutMode() {
+ mIsGridMode = !mIsGridMode;
+ if (mIsGridMode) {
+ // 切换到九宫格模式
+ mNotesListView.setVisibility(View.GONE);
+ mNotesGridView.setVisibility(View.VISIBLE);
+ Toast.makeText(this, "已切换到九宫格模式", Toast.LENGTH_SHORT).show();
+ } else {
+ // 切换到列表模式
+ mNotesGridView.setVisibility(View.GONE);
+ mNotesListView.setVisibility(View.VISIBLE);
+ Toast.makeText(this, "已切换到列表模式", Toast.LENGTH_SHORT).show();
+ }
+ }
+
private void restoreSelectedNotes() {
if (mNotesListAdapter.getSelectedCount() == 0) {
Toast.makeText(this, "请先选择要恢复的便签", Toast.LENGTH_SHORT).show();
--
2.34.1