diff --git a/README.md b/README.md index 0b0a565..5fe9026 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -#小米便签项目 \ No newline at end of file +#小米便签项目 +11 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 845436e..384548c 100644 --- a/build.gradle +++ b/build.gradle @@ -25,8 +25,8 @@ android { defaultConfig { applicationId "net.micode.notes" - minSdkVersion 14 - targetSdkVersion 14 + minSdkVersion 30 + targetSdkVersion 30 } buildTypes { diff --git a/doc/孙瑛峻_小米便签代码标注.docx b/doc/孙瑛峻_小米便签代码标注.docx new file mode 100644 index 0000000..7c1cc4d Binary files /dev/null and b/doc/孙瑛峻_小米便签代码标注.docx differ diff --git a/doc/宋经纬_小米便签代码标注.docx b/doc/宋经纬_小米便签代码标注.docx new file mode 100644 index 0000000..14dc588 Binary files /dev/null and b/doc/宋经纬_小米便签代码标注.docx differ diff --git a/doc/宋经纬_小米便签开源代码的泛读报告.docx b/doc/宋经纬_小米便签开源代码的泛读报告.docx new file mode 100644 index 0000000..00dd1d1 Binary files /dev/null and b/doc/宋经纬_小米便签开源代码的泛读报告.docx differ diff --git a/doc/小米便签新增功能文档.docx b/doc/小米便签新增功能文档.docx new file mode 100644 index 0000000..55c08d0 Binary files /dev/null and b/doc/小米便签新增功能文档.docx differ diff --git a/doc/朱睿民_小米便签代码标注.docx b/doc/朱睿民_小米便签代码标注.docx new file mode 100644 index 0000000..37fa903 Binary files /dev/null and b/doc/朱睿民_小米便签代码标注.docx differ diff --git a/doc/田浩_小米便签代码标注.docx b/doc/田浩_小米便签代码标注.docx new file mode 100644 index 0000000..4652fa7 Binary files /dev/null and b/doc/田浩_小米便签代码标注.docx differ diff --git a/doc/申博昊_小米便签代码标注.docx b/doc/申博昊_小米便签代码标注.docx new file mode 100644 index 0000000..c33a5d5 Binary files /dev/null and b/doc/申博昊_小米便签代码标注.docx differ diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index e5c7d47..2306c98 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -20,7 +20,7 @@ android:versionCode="1" android:versionName="0.1" > - + diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 96a9ff8..9dfc4dc 100644 --- a/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -44,6 +44,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.WindowManager; import android.widget.CheckBox; +import android.widget.Button; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; @@ -149,11 +150,14 @@ public class NoteEditActivity extends Activity implements OnClickListener, private String mUserQuery; private Pattern mPattern; + private Button menuButton; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); this.setContentView(R.layout.note_edit); - + menuButton = (Button) findViewById(R.id.btn_show_menu); + menuButton.setOnClickListener(new NoteEditActivity.MenuBtnOnClickListener()); if (savedInstanceState == null && !initActivityState(getIntent())) { finish(); return; @@ -870,4 +874,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } + + private class MenuBtnOnClickListener implements OnClickListener{ + @Override + public void onClick(View v) { + openOptionsMenu(); + } + } + } diff --git a/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java index e843aec..3ac508e 100644 --- a/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -105,6 +105,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private Button mAddNewNote; + private Button menuButton; + private boolean mDispatch; private int mOriginY; @@ -223,6 +225,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mAddNewNote = (Button) findViewById(R.id.btn_new_note); mAddNewNote.setOnClickListener(this); mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener()); + menuButton = (Button) findViewById(R.id.btn_show_menu); + menuButton.setOnClickListener(new MenuBtnOnClickListener()); mDispatch = false; mDispatchY = 0; mOriginY = 0; @@ -346,6 +350,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } + + private class MenuBtnOnClickListener implements OnClickListener{ + @Override + public void onClick(View v) { + openOptionsMenu(); + } + } + private class NewNoteOnTouchListener implements OnTouchListener { public boolean onTouch(View v, MotionEvent event) { diff --git a/src/main/res/layout/note_edit.xml b/src/main/res/layout/note_edit.xml index 10b2aa7..fbe78c6 100644 --- a/src/main/res/layout/note_edit.xml +++ b/src/main/res/layout/note_edit.xml @@ -397,4 +397,12 @@ android:src="@drawable/selected" /> +