From 953edd0d8ac94febff7ed700d90286a0b4a20023 Mon Sep 17 00:00:00 2001 From: xxl <2532500952@qq.com> Date: Wed, 17 Nov 2021 19:43:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E4=BC=9A=E6=9C=89=E6=A3=80=E9=AA=8C=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=BC=B9=E7=AA=97=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/dialog_create_new_folder.xml | 29 +++++++++++++++++++ .../res/layout/dialog_edit_text.xml | 12 ++++---- .../net/micode/notes/ui/NoteEditActivity.java | 18 ++++++------ .../micode/notes/ui/NotesListActivity.java | 5 ++-- 4 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 src/Notes-master/res/layout/dialog_create_new_folder.xml diff --git a/src/Notes-master/res/layout/dialog_create_new_folder.xml b/src/Notes-master/res/layout/dialog_create_new_folder.xml new file mode 100644 index 0000000..21bbbc1 --- /dev/null +++ b/src/Notes-master/res/layout/dialog_create_new_folder.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master/res/layout/dialog_edit_text.xml b/src/Notes-master/res/layout/dialog_edit_text.xml index bc9178f..677719b 100644 --- a/src/Notes-master/res/layout/dialog_edit_text.xml +++ b/src/Notes-master/res/layout/dialog_edit_text.xml @@ -26,13 +26,13 @@ android:layout_height="wrap_content" android:gravity="center"> @@ -43,13 +43,13 @@ android:layout_height="wrap_content" android:gravity="center"> @@ -61,13 +61,13 @@ android:layout_height="wrap_content" android:gravity="center"> diff --git a/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java index c18427a..d0877a7 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java @@ -281,14 +281,14 @@ public class NoteEditActivity extends Activity implements OnClickListener, final AlertDialog.Builder builder = new AlertDialog.Builder(this); View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null); //编辑dialog界面 - final EditText etNameOld= (EditText)view.findViewById(R.id.et_foler_name_old);//只需要验证原密码 - final EditText etName = (EditText) view.findViewById(R.id.et_foler_name); + final EditText etNameOld= (EditText)view.findViewById(R.id.old_password);//只需要验证原密码 + final EditText etName = (EditText) view.findViewById(R.id.new_password); etName.setVisibility(view.GONE); - final TextView etName_View=(TextView)view.findViewById(R.id.et_foler_name_view); + final TextView etName_View=(TextView)view.findViewById(R.id.new_password_view); etName_View.setVisibility(view.GONE); - final EditText etNameAgain = (EditText) view.findViewById(R.id.et_foler_name_again); + final EditText etNameAgain = (EditText) view.findViewById(R.id.new_password_again); etNameAgain.setVisibility(view.GONE); - final TextView etNameAgain_View=(TextView)view.findViewById(R.id.et_foler_name_again_view); + final TextView etNameAgain_View=(TextView)view.findViewById(R.id.new_password_again_view); etNameAgain_View.setVisibility(view.GONE); // builder.setTitle("密码检验"); @@ -644,9 +644,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, final AlertDialog.Builder builder = new AlertDialog.Builder(this); final View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text,null); //编辑Text - final EditText etNameOld= (EditText)view.findViewById(R.id.et_foler_name_old);//如果设置了密码，这是原密码 + final EditText etNameOld= (EditText)view.findViewById(R.id.old_password);//如果设置了密码，这是原密码 etNameOld.setVisibility(view.GONE); - final TextView etNameOld_View=(TextView)view.findViewById(R.id.et_foler_name_old_view); + final TextView etNameOld_View=(TextView)view.findViewById(R.id.old_password_view); etNameOld_View.setVisibility(view.GONE); if (mWorkingNote.hasPassword()){//如果设置了密码 etNameOld.setVisibility(view.VISIBLE); @@ -654,8 +654,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, etNameOld.setText(""); etNameOld.setHint("请输入原密码"); } - final EditText etName = (EditText)view.findViewById(R.id.et_foler_name);//要设置的密码 - final EditText etNameAgain=(EditText)view.findViewById(R.id.et_foler_name_again);//确认密码 + final EditText etName = (EditText)view.findViewById(R.id.new_password);//要设置的密码 + final EditText etNameAgain=(EditText)view.findViewById(R.id.new_password_again);//确认密码 //final EditText finalEtNameOld = etNameOld; etName.setText(""); etName.setHint("请输入密码"); diff --git a/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java index 6a53db8..51b74eb 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java @@ -581,8 +581,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private void showCreateOrModifyFolderDialog(final boolean create) { final AlertDialog.Builder builder = new AlertDialog.Builder(this); - View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null); - final EditText etName = (EditText) view.findViewById(R.id.et_foler_name); + View view = LayoutInflater.from(this).inflate(R.layout.dialog_create_new_folder, null); + final EditText etName = (EditText) view.findViewById(R.id.folder_name); showSoftInput(); if (!create) { if (mFocusNoteDataItem != null) { @@ -783,6 +783,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt switch (item.getItemId()) { case R.id.menu_new_folder: { showCreateOrModifyFolderDialog(true); + Log.d("创建了文件夹","是的"); break; } case R.id.menu_export_text: { -- 2.34.1