|
|
|
@ -279,6 +279,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
|
|
|
|
|
mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
|
|
|
|
|
mNoteEditor.setSelection(mNoteEditor.getText().length());
|
|
|
|
|
}
|
|
|
|
|
applyTextStyle();
|
|
|
|
|
for (Integer id : sBgSelectorSelectionMap.keySet()) {
|
|
|
|
|
findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
|
|
|
|
|
}
|
|
|
|
@ -442,7 +443,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
|
|
|
|
|
if (id == R.id.btn_set_bg_color) {
|
|
|
|
|
mNoteBgColorSelector.setVisibility(View.VISIBLE);
|
|
|
|
|
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
|
|
|
|
|
- View.VISIBLE);
|
|
|
|
|
View.VISIBLE);
|
|
|
|
|
} else if (sBgSelectorBtnsMap.containsKey(id)) {
|
|
|
|
|
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
|
|
|
|
|
View.GONE);
|
|
|
|
@ -743,6 +744,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
|
|
|
|
|
View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
|
|
|
|
|
final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
|
|
|
|
|
edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
|
|
|
|
|
|
|
|
|
|
if (mWorkingNote.getBoldState()) {
|
|
|
|
|
edit.setTypeface(null, android.graphics.Typeface.BOLD);
|
|
|
|
|
} else {
|
|
|
|
|
edit.setTypeface(null, android.graphics.Typeface.NORMAL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
|
|
|
|
|
cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
|
|
|
|
|
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
|
|
|
@ -899,13 +907,52 @@ public class NoteEditActivity extends Activity implements OnClickListener,
|
|
|
|
|
} else {
|
|
|
|
|
popupMenu.getMenuInflater().inflate(R.menu.note_edit, popupMenu.getMenu());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 根据字体加粗状态设置菜单文本
|
|
|
|
|
MenuItem boldMenuItem = popupMenu.getMenu().findItem(R.id.menu_bold);
|
|
|
|
|
if (boldMenuItem != null) {
|
|
|
|
|
if (mWorkingNote.getBoldState()) {
|
|
|
|
|
boldMenuItem.setTitle(R.string.menu_unbold);
|
|
|
|
|
} else {
|
|
|
|
|
boldMenuItem.setTitle(R.string.menu_bold);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 设置菜单项点击事件
|
|
|
|
|
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
|
|
|
|
|
@Override
|
|
|
|
|
public boolean onMenuItemClick(MenuItem item) {
|
|
|
|
|
if (item.getItemId() == R.id.menu_bold) {
|
|
|
|
|
mWorkingNote.setBoldState(!mWorkingNote.getBoldState());
|
|
|
|
|
applyTextStyle();
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return onOptionsItemSelected(item); // 复用原有逻辑
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
popupMenu.show();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void applyTextStyle() {
|
|
|
|
|
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
|
|
|
|
|
// 遍历所有NoteEditText并应用样式
|
|
|
|
|
for (int i = 0; i < mEditTextList.getChildCount(); i++) {
|
|
|
|
|
View view = mEditTextList.getChildAt(i);
|
|
|
|
|
NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
|
|
|
|
|
edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
|
|
|
|
|
if (mWorkingNote.getBoldState()) {
|
|
|
|
|
edit.setTypeface(null, android.graphics.Typeface.BOLD);
|
|
|
|
|
} else {
|
|
|
|
|
edit.setTypeface(null, android.graphics.Typeface.NORMAL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
|
|
|
|
|
if (mWorkingNote.getBoldState()) {
|
|
|
|
|
mNoteEditor.setTypeface(null, android.graphics.Typeface.BOLD);
|
|
|
|
|
} else {
|
|
|
|
|
mNoteEditor.setTypeface(null, android.graphics.Typeface.NORMAL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|