pcs4l98ag
/
lwp-gitpracticed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: pcs4l98ag:ef17df26cde247fa1fef50495f834b813e9a0fdf
Branches Tags
pcs4l98ag:master
pcs4l98ag:l_branch
pcs4l98ag:main
..
compare: pcs4l98ag:c7e6a0b2a7b6cedbf6faec29cee58210221204b1
Branches Tags
pcs4l98ag:master
pcs4l98ag:l_branch
pcs4l98ag:main

No commits in common. 'ef17df26cde247fa1fef50495f834b813e9a0fdf' and 'c7e6a0b2a7b6cedbf6faec29cee58210221204b1' have entirely different histories.
ef17df26cd ... c7e6a0b2a7

2 changed files with 76 additions and 68 deletions
Show Stats

59
Note-masters/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
Unescape View File

@ -507,12 +507,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId(); switch (item.getItemId()) {
case R.id.menu_new_note:
if (id ==R.id.menu_new_note) { createNewNote();
createNewNote(); break;
case R.id.menu_delete:
}else if (id ==R.id.menu_delete){
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.alert_title_delete)); builder.setTitle(getString(R.string.alert_title_delete));
builder.setIcon(android.R.drawable.ic_dialog_alert); builder.setIcon(android.R.drawable.ic_dialog_alert);
@ -526,29 +525,31 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}); });
builder.setNegativeButton(android.R.string.cancel, null); builder.setNegativeButton(android.R.string.cancel, null);
builder.show(); builder.show();
break;
} else if (id ==R.id.menu_font_size) { case R.id.menu_font_size:
mFontSizeSelector.setVisibility(View.VISIBLE); mFontSizeSelector.setVisibility(View.VISIBLE);
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
} break;
else if (id ==R.id.menu_list_mode) { case R.id.menu_list_mode:
mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
TextNote.MODE_CHECK_LIST : 0); TextNote.MODE_CHECK_LIST : 0);
} break;
else if (id ==R.id.menu_share) { case R.id.menu_share:
getWorkingText(); getWorkingText();
sendTo(this, mWorkingNote.getContent()); sendTo(this, mWorkingNote.getContent());
} break;
else if (id ==R.id.menu_send_to_desktop) { case R.id.menu_send_to_desktop:
sendToDesktop(); sendToDesktop();
} break;
else if (id ==R.id.menu_alert) { case R.id.menu_alert:
setReminder(); setReminder();
} break;
else if (id ==R.id.menu_delete_remind) { case R.id.menu_delete_remind:
mWorkingNote.setAlertDate(0, false); mWorkingNote.setAlertDate(0, false);
} break;
default:
break;
}
return true; return true;
} }

85
Note-masters/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
Unescape View File

@ -318,27 +318,30 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
return true; return true;
} }
int id = item.getItemId();
if (id==R.id.delete) { switch (item.getItemId()) {
case R.id.delete:
AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
builder.setTitle(getString(R.string.alert_title_delete)); builder.setTitle(getString(R.string.alert_title_delete));
builder.setIcon(android.R.drawable.ic_dialog_alert); builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setMessage(getString(R.string.alert_message_delete_notes, builder.setMessage(getString(R.string.alert_message_delete_notes,
mNotesListAdapter.getSelectedCount())); mNotesListAdapter.getSelectedCount()));
builder.setPositiveButton(android.R.string.ok, builder.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, public void onClick(DialogInterface dialog,
int which) { int which) {
batchDelete(); batchDelete();
} }
}); });
builder.setNegativeButton(android.R.string.cancel, null); builder.setNegativeButton(android.R.string.cancel, null);
builder.show(); builder.show();
} break;
else if (id==R.id.move) { case R.id.move:
startQueryDestinationFolders(); startQueryDestinationFolders();
} break;
default:
return false;
}
return true; return true;
} }
} }
@ -555,9 +558,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
} }
public void onClick(View v) { public void onClick(View v) {
int id = v.getId(); switch (v.getId()) {
if (id == R.id.btn_new_note) { case R.id.btn_new_note:
createNewNote(); createNewNote();
break;
default:
break;
} }
} }
@ -774,17 +780,16 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId(); switch (item.getItemId()) {
case R.id.menu_new_folder: {
if (id==R.id.menu_new_folder) {
showCreateOrModifyFolderDialog(true); showCreateOrModifyFolderDialog(true);
break;
} }
else if (id==R.id.menu_export_text) { case R.id.menu_export_text: {
exportNoteToText(); exportNoteToText();
break;
} }
else if (id==R.id.menu_sync) { case R.id.menu_sync: {
if (isSyncMode()) { if (isSyncMode()) {
if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) {
GTaskSyncService.startSync(this); GTaskSyncService.startSync(this);
@ -794,20 +799,22 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
} else { } else {
startPreferenceActivity(); startPreferenceActivity();
} }
break;
} }
else if (id==R.id.menu_setting) { case R.id.menu_setting: {
startPreferenceActivity(); startPreferenceActivity();
break;
} }
else if (id==R.id.menu_new_note) { case R.id.menu_new_note: {
createNewNote(); createNewNote();
break;
} }
else if (id==R.id.menu_search) { case R.id.menu_search:
onSearchRequested(); onSearchRequested();
} break;
default:
break;
}
return true; return true;
} }

Write Preview
Loading…
Cancel
Save