diff --git a/src/main/java/net/micode/notes/data/Notes.java b/src/main/java/net/micode/notes/data/Notes.java index 4974bdc..60fbd39 100644 --- a/src/main/java/net/micode/notes/data/Notes.java +++ b/src/main/java/net/micode/notes/data/Notes.java @@ -41,6 +41,7 @@ public class Notes { public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type"; public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id"; public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; + public static final String INTENT_EXTRA_TEMPLE_TEXT="net.micode.notes.temple_text"; public static final int TYPE_WIDGET_INVALIDE = -1; public static final int TYPE_WIDGET_2X = 0; diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 99f2b4a..839a139 100644 --- a/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -271,11 +271,20 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private void initNoteScreen() { + + String defaultText = getIntent().getStringExtra(Notes.INTENT_EXTRA_TEMPLE_TEXT); + if(defaultText!=null){ + saveNote();//否则会增加一个null的奇怪现象 + mWorkingNote.setWorkingText(mWorkingNote.getContent()+defaultText); + mNoteEditor.setText(mWorkingNote.getContent()); // 将defaultText的值写入到笔记编辑器中 + } +// Toast.makeText(getApplicationContext(), defaultText, Toast.LENGTH_SHORT).show(); mNoteEditor.setTextAppearance(this, TextAppearanceResources .getTexAppearanceResource(mFontSizeId)); if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { switchToListMode(mWorkingNote.getContent()); } else { + ; mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mNoteEditor.setSelection(mNoteEditor.getText().length()); } diff --git a/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java index 6d060fe..0b1591d 100644 --- a/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -466,6 +466,18 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId); this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE); } + private void createTempelNote(int num){ + String temple1="Time:\nClass:\nTeacher:\nScore:\n"; + String temple2="Group:\nLeader:\nNumber:\nScore:\n"; + String temple3="早操:\n早餐:\n第一节课:\n"; + String[] temple= {temple1,temple2,temple2}; + Intent intent = new Intent(this, NoteEditActivity.class); + intent.setAction(Intent.ACTION_INSERT_OR_EDIT); + intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId); + intent.putExtra(Notes.INTENT_EXTRA_TEMPLE_TEXT,temple[num-1]); + this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE); + } + private void batchDelete() { new AsyncTask>() { @@ -557,7 +569,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt public void onClick(View v) { if (v.getId() == R.id.btn_new_note) { - createNewNote(); + selectCreatemode(this); +// createNewNote(); } } @@ -998,5 +1011,34 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt openNode(item); } } + public void selectCreatemode(Context context){ + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle("选择模板") + .setItems(new CharSequence[]{"创建空新模板", "创建模板 1", "创建模板 2", "创建模板 3"}, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + switch (which) { + case 0: + // 创建空的模板 + createNewNote(); + break; + case 1: + // 创建模板 1 + createTempelNote(1); +// createTemplate("模板 1"); + break; + case 2: + // 创建模板 2 + createTempelNote(2); +// break; + case 3: + // 创建模板 3 + createTempelNote(3); + break; + } + } + }) + .show(); + + } }