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
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id ==R.id.menu_new_note) {
createNewNote();
}else if (id ==R.id.menu_delete){
switch (item.getItemId()) {
case R.id.menu_new_note:
createNewNote();
break;
case R.id.menu_delete:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.alert_title_delete));
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.show();
} else if (id ==R.id.menu_font_size) {
mFontSizeSelector.setVisibility(View.VISIBLE);
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
}
else if (id ==R.id.menu_list_mode) {
mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
TextNote.MODE_CHECK_LIST : 0);
}
else if (id ==R.id.menu_share) {
getWorkingText();
sendTo(this, mWorkingNote.getContent());
}
else if (id ==R.id.menu_send_to_desktop) {
sendToDesktop();
}
else if (id ==R.id.menu_alert) {
setReminder();
}
else if (id ==R.id.menu_delete_remind) {
mWorkingNote.setAlertDate(0, false);
}
break;
case R.id.menu_font_size:
mFontSizeSelector.setVisibility(View.VISIBLE);
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
break;
case R.id.menu_list_mode:
mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
TextNote.MODE_CHECK_LIST : 0);
break;
case R.id.menu_share:
getWorkingText();
sendTo(this, mWorkingNote.getContent());
break;
case R.id.menu_send_to_desktop:
sendToDesktop();
break;
case R.id.menu_alert:
setReminder();
break;
case R.id.menu_delete_remind:
mWorkingNote.setAlertDate(0, false);
break;
default:
break;
}
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();
return true;
}
int id = item.getItemId();
if (id==R.id.delete) {
AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
builder.setTitle(getString(R.string.alert_title_delete));
builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setMessage(getString(R.string.alert_message_delete_notes,
mNotesListAdapter.getSelectedCount()));
builder.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int which) {
batchDelete();
}
});
builder.setNegativeButton(android.R.string.cancel, null);
builder.show();
}
else if (id==R.id.move) {
startQueryDestinationFolders();
}
switch (item.getItemId()) {
case R.id.delete:
AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
builder.setTitle(getString(R.string.alert_title_delete));
builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setMessage(getString(R.string.alert_message_delete_notes,
mNotesListAdapter.getSelectedCount()));
builder.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int which) {
batchDelete();
}
});
builder.setNegativeButton(android.R.string.cancel, null);
builder.show();
break;
case R.id.move:
startQueryDestinationFolders();
break;
default:
return false;
}
return true;
}
}
@ -555,9 +558,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
public void onClick(View v) {
int id = v.getId();
if (id == R.id.btn_new_note) {
createNewNote();
switch (v.getId()) {
case R.id.btn_new_note:
createNewNote();
break;
default:
break;
}
}
@ -774,17 +780,16 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id==R.id.menu_new_folder) {
switch (item.getItemId()) {
case R.id.menu_new_folder: {
showCreateOrModifyFolderDialog(true);
break;
}
else if (id==R.id.menu_export_text) {
case R.id.menu_export_text: {
exportNoteToText();
break;
}
else if (id==R.id.menu_sync) {
case R.id.menu_sync: {
if (isSyncMode()) {
if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) {
GTaskSyncService.startSync(this);
@ -794,20 +799,22 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
} else {
startPreferenceActivity();
}
break;
}
else if (id==R.id.menu_setting) {
case R.id.menu_setting: {
startPreferenceActivity();
break;
}
else if (id==R.id.menu_new_note) {
case R.id.menu_new_note: {
createNewNote();
break;
}
else if (id==R.id.menu_search) {
case R.id.menu_search:
onSearchRequested();
}
break;
default:
break;
}
return true;
}

Write Preview
Loading…
Cancel
Save