m6omickaf
/
TeamProject
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

回收站雏形

Browse Source
pull/6/head
Mars_RH 2 years ago
parent 3ad0e4a5eb
commit 34dac7cef7
7 changed files with 494 additions and 414 deletions
Show Stats Download Patch File Download Diff File

2
src/.idea/deploymentTargetDropDown.xml
Unescape View File

@ -12,6 +12,6 @@
</deviceKey> </deviceKey>
</Target> </Target>
</targetSelectedWithDropDown> </targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-04-10T13:04:51.122769700Z" /> <timeTargetWasSelectedWithDropDown value="2023-05-26T06:09:38.060917300Z" />
</component> </component>
</project> </project>

14
src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
Unescape View File

@ -495,21 +495,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mCurrentFolderId = mFocusNoteDataItem.getFolderId(); mCurrentFolderId = mFocusNoteDataItem.getFolderId();
if (mCurrentFolderId == Notes.ID_TRASH_FOLER){
// if in trash, delete notes directly
if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
.getSelectedItemIds())) {
} else {
Log.e(TAG, "Delete notes error, should not happens");
}
}
else{
//move to trash //move to trash
if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
.getSelectedItemIds(), Notes.ID_TRASH_FOLER)) { .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
Log.e(TAG, "Move notes to trash folder error, should not happens"); Log.e(TAG, "Move notes to trash folder error, should not happens");
} }
}
return widgets; return widgets;
} }
@ -836,7 +827,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
break; break;
case R.id.RecycleBin: case R.id.RecycleBin:
recycleBin(); recycleBin();
// TODO: 2023/5/25 add a page for the recyclebin
break; break;
default: default:
break; break;
@ -855,6 +845,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private void recycleBin() { private void recycleBin() {
Intent intent=new Intent(NotesListActivity.this,RecycleBinActivity.class); Intent intent=new Intent(NotesListActivity.this,RecycleBinActivity.class);
startActivity(intent); startActivity(intent);
mTitleBar.setText("trash folder");
mTitleBar.setVisibility(View.VISIBLE);
finish(); finish();
} }

846
src/app/src/main/java/net/micode/notes/ui/RecycleBinActivity.java
Unescape View File

@ -28,6 +28,7 @@ import android.view.Display;
import android.view.HapticFeedbackConstants; import android.view.HapticFeedbackConstants;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MenuItem.OnMenuItemClickListener; import android.view.MenuItem.OnMenuItemClickListener;
import android.view.MotionEvent; import android.view.MotionEvent;
@ -103,7 +104,7 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
private ContentResolver mContentResolver; private ContentResolver mContentResolver;
private ModeCallback mModeCallBack; // private ModeCallback mModeCallBack;
private static final String TAG = "RecycleActivity"; private static final String TAG = "RecycleActivity";
@ -111,6 +112,8 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
private NoteItemData mFocusNoteDataItem; private NoteItemData mFocusNoteDataItem;
private MenuItem menuItem;
private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?"; private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?";
private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>" private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>"
@ -130,7 +133,7 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
/** /**
* Insert an introduction when user firstly use this application * Insert an introduction when user firstly use this application
*/ */
setAppInfoFromRawRes(); // setAppInfoFromRawRes();
} }
@Override @Override
@ -143,51 +146,50 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
} }
} }
private void setAppInfoFromRawRes() { // private void setAppInfoFromRawRes() {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); // SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { // if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
StringBuilder sb = new StringBuilder(); // StringBuilder sb = new StringBuilder();
InputStream in = null; // InputStream in = null;
try { // try {
in = getResources().openRawResource(R.raw.introduction); // in = getResources().openRawResource(R.raw.introduction);
if (in != null) { // if (in != null) {
InputStreamReader isr = new InputStreamReader(in); // InputStreamReader isr = new InputStreamReader(in);
BufferedReader br = new BufferedReader(isr); // BufferedReader br = new BufferedReader(isr);
char [] buf = new char[1024]; // char [] buf = new char[1024];
int len = 0; // int len = 0;
while ((len = br.read(buf)) > 0) { // while ((len = br.read(buf)) > 0) {
sb.append(buf, 0, len); // sb.append(buf, 0, len);
} // }
} else { // } else {
Log.e(TAG, "Read introduction file error"); // Log.e(TAG, "Read introduction file error");
return; // return;
} // }
} catch (IOException e) { // } catch (IOException e) {
e.printStackTrace(); // e.printStackTrace();
return; // return;
} finally { // } finally {
if(in != null) { // if(in != null) {
try { // try {
in.close(); // in.close();
} catch (IOException e) { // } catch (IOException e) {
// TODO Auto-generated catch block // e.printStackTrace();
e.printStackTrace(); // }
} // }
} // }
} //
// WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER,
WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER, // AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE,
AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE, // ResourceParser.RED);
ResourceParser.RED); // note.setWorkingText(sb.toString());
note.setWorkingText(sb.toString()); // if (note.saveNote()) {
if (note.saveNote()) { // sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit(); // } else {
} else { // Log.e(TAG, "Save introduction note error");
Log.e(TAG, "Save introduction note error"); // return;
return; // }
} // }
} // }
}
@Override @Override
protected void onStart() { protected void onStart() {
@ -199,12 +201,13 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
mContentResolver = this.getContentResolver(); mContentResolver = this.getContentResolver();
mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver()); mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
mCurrentFolderId = Notes.ID_TRASH_FOLER; mCurrentFolderId = Notes.ID_TRASH_FOLER;
mNotesListView = (ListView) findViewById(R.id.notes_list); mNotesListView = (ListView) findViewById(R.id.recycle_list);
mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null), mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null),
null, false); null, false);
mNotesListView.setOnItemClickListener(new OnListItemClickListener()); mNotesListView.setOnItemClickListener(new OnListItemClickListener());
mNotesListView.setOnItemLongClickListener(this); // mNotesListView.setOnItemLongClickListener(this);
mNotesListAdapter = new NotesListAdapter(this); mNotesListAdapter = new NotesListAdapter(this);
mNotesListAdapter.setChoiceMode(true);
mNotesListView.setAdapter(mNotesListAdapter); mNotesListView.setAdapter(mNotesListAdapter);
// mAddNewNote = (Button) findViewById(R.id.btn_new_note); // mAddNewNote = (Button) findViewById(R.id.btn_new_note);
// mAddNewNote.setOnClickListener(this); // mAddNewNote.setOnClickListener(this);
@ -214,185 +217,189 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
mOriginY = 0; mOriginY = 0;
mTitleBar = (TextView) findViewById(R.id.tv_title_bar); mTitleBar = (TextView) findViewById(R.id.tv_title_bar);
mState = ListEditState.NOTE_LIST; mState = ListEditState.NOTE_LIST;
mModeCallBack = new ModeCallback(); // mModeCallBack = new ModeCallback();
// mNotesListView.startActionMode(mModeCallBack);
} }
private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener { /**
private DropdownMenu mDropDownMenu; * 重置选择器状态
private ActionMode mActionMode; */
private MenuItem mMoveMenu; private void reset_ChoiseMode(){
mNotesListAdapter.setChoiceMode(false);
public boolean onCreateActionMode(ActionMode mode, Menu menu) { mNotesListAdapter.setChoiceMode(true);
getMenuInflater().inflate(R.menu.note_list_options, menu);
menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
mMoveMenu = menu.findItem(R.id.move);
if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
|| DataUtils.getUserFolderCount(mContentResolver) == 0) {
mMoveMenu.setVisible(false);
} else {
mMoveMenu.setVisible(true);
mMoveMenu.setOnMenuItemClickListener(this);
}
mActionMode = mode;
mNotesListAdapter.setChoiceMode(true);
mNotesListView.setLongClickable(false);
// mAddNewNote.setVisibility(View.GONE);
View customView = LayoutInflater.from(RecycleBinActivity.this).inflate(
R.layout.note_list_dropdown_menu, null);
mode.setCustomView(customView);
mDropDownMenu = new DropdownMenu(RecycleBinActivity.this,
(Button) customView.findViewById(R.id.selection_menu),
R.menu.note_list_dropdown);
mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
public boolean onMenuItemClick(MenuItem item) {
mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
updateMenu();
return true;
}
});
return true;
}
private void updateMenu() {
int selectedCount = mNotesListAdapter.getSelectedCount();
// Update dropdown menu
String format = getResources().getString(R.string.menu_select_title, selectedCount);
mDropDownMenu.setTitle(format);
MenuItem item = mDropDownMenu.findItem(R.id.action_select_all);
if (item != null) {
if (mNotesListAdapter.isAllSelected()) {
item.setChecked(true);
item.setTitle(R.string.menu_deselect_all);
} else {
item.setChecked(false);
item.setTitle(R.string.menu_select_all);
}
}
}
public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
// TODO Auto-generated method stub
return false;
}
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
// TODO Auto-generated method stub
return false;
}
public void onDestroyActionMode(ActionMode mode) {
mNotesListAdapter.setChoiceMode(false);
mNotesListView.setLongClickable(true);
// mAddNewNote.setVisibility(View.VISIBLE);
}
public void finishActionMode() {
mActionMode.finish();
}
public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
boolean checked) {
mNotesListAdapter.setCheckedItem(position, checked);
updateMenu();
}
public boolean onMenuItemClick(MenuItem item) {
if (mNotesListAdapter.getSelectedCount() == 0) {
Toast.makeText(RecycleBinActivity.this, getString(R.string.menu_select_none),
Toast.LENGTH_SHORT).show();
return true;
}
switch (item.getItemId()) {
case R.id.delete:
AlertDialog.Builder builder = new AlertDialog.Builder(RecycleBinActivity.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;
}
} }
// TODO: 2023/5/26 重写这一块
// private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
// private DropdownMenu mDropDownMenu;
// private ActionMode mActionMode;
// private MenuItem mMoveMenu;
//
// public boolean onCreateActionMode(ActionMode mode, Menu menu) {
// getMenuInflater().inflate(R.menu.note_list_options, menu);
// menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
// mMoveMenu = menu.findItem(R.id.move);
//
// mMoveMenu.setVisible(true);
// mMoveMenu.setOnMenuItemClickListener(this);
//
// mActionMode = mode;
// mNotesListAdapter.setChoiceMode(true);
// mNotesListView.setLongClickable(false);
//// mAddNewNote.setVisibility(View.GONE);
//
// View customView = LayoutInflater.from(RecycleBinActivity.this).inflate(
// R.layout.note_list_dropdown_menu, null);
// mode.setCustomView(customView);
// mDropDownMenu = new DropdownMenu(RecycleBinActivity.this,
// (Button) customView.findViewById(R.id.selection_menu),
// R.menu.note_list_dropdown);
// mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
// public boolean onMenuItemClick(MenuItem item) {
// mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
// updateMenu();
// return true;
// }
//
// });
// return true;
// }
//
// private void updateMenu() {
// int selectedCount = mNotesListAdapter.getSelectedCount();
// // Update dropdown menu
// String format = getResources().getString(R.string.menu_select_title, selectedCount);
// mDropDownMenu.setTitle(format);
// MenuItem item = mDropDownMenu.findItem(R.id.action_select_all);
// if (item != null) {
// if (mNotesListAdapter.isAllSelected()) {
// item.setChecked(true);
// item.setTitle(R.string.menu_deselect_all);
// } else {
// item.setChecked(false);
// item.setTitle(R.string.menu_select_all);
// }
// }
// }
//
// public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
// return false;
// }
//
// public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
// return false;
// }
//
// public void onDestroyActionMode(ActionMode mode) {
//// mNotesListAdapter.setChoiceMode(false);
//// mNotesListView.setLongClickable(true);
//// mAddNewNote.setVisibility(View.VISIBLE);
// }
//
// public void finishActionMode() {
// mActionMode.finish();
// }
//
// public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
// boolean checked) {
// mNotesListAdapter.setCheckedItem(position, checked);
// updateMenu();
// }
//
// public boolean onMenuItemClick(MenuItem item) {
// if (mNotesListAdapter.getSelectedCount() == 0) {
// Toast.makeText(RecycleBinActivity.this, getString(R.string.menu_select_none),
// Toast.LENGTH_SHORT).show();
// return true;
// }
//
// switch (item.getItemId()) {
// case R.id.delete:
// AlertDialog.Builder builder = new AlertDialog.Builder(RecycleBinActivity.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;
// }
// }
private class NewNoteOnTouchListener implements OnTouchListener { // private class NewNoteOnTouchListener implements OnTouchListener {
//
public boolean onTouch(View v, MotionEvent event) { // public boolean onTouch(View v, MotionEvent event) {
switch (event.getAction()) { // switch (event.getAction()) {
case MotionEvent.ACTION_DOWN: { // case MotionEvent.ACTION_DOWN: {
Display display = getWindowManager().getDefaultDisplay(); // Display display = getWindowManager().getDefaultDisplay();
int screenHeight = display.getHeight(); // int screenHeight = display.getHeight();
int newNoteViewHeight = mAddNewNote.getHeight(); // int newNoteViewHeight = mAddNewNote.getHeight();
int start = screenHeight - newNoteViewHeight; // int start = screenHeight - newNoteViewHeight;
int eventY = start + (int) event.getY(); // int eventY = start + (int) event.getY();
/** // /**
* Minus TitleBar's height // * Minus TitleBar's height
*/ // */
if (mState == ListEditState.SUB_FOLDER) { // if (mState == ListEditState.SUB_FOLDER) {
eventY -= mTitleBar.getHeight(); // eventY -= mTitleBar.getHeight();
start -= mTitleBar.getHeight(); // start -= mTitleBar.getHeight();
} // }
/** // /**
* HACKME:When click the transparent part of "New Note" button, dispatch // * HACKME:When click the transparent part of "New Note" button, dispatch
* the event to the list view behind this button. The transparent part of // * the event to the list view behind this button. The transparent part of
* "New Note" button could be expressed by formula y=-0.12x+94（Unit:pixel） // * "New Note" button could be expressed by formula y=-0.12x+94（Unit:pixel）
* and the line top of the button. The coordinate based on left of the "New // * and the line top of the button. The coordinate based on left of the "New
* Note" button. The 94 represents maximum height of the transparent part. // * Note" button. The 94 represents maximum height of the transparent part.
* Notice that, if the background of the button changes, the formula should // * Notice that, if the background of the button changes, the formula should
* also change. This is very bad, just for the UI designer's strong requirement. // * also change. This is very bad, just for the UI designer's strong requirement.
*/ // */
if (event.getY() < (event.getX() * (-0.12) + 94)) { // if (event.getY() < (event.getX() * (-0.12) + 94)) {
View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1 // View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1
- mNotesListView.getFooterViewsCount()); // - mNotesListView.getFooterViewsCount());
if (view != null && view.getBottom() > start // if (view != null && view.getBottom() > start
&& (view.getTop() < (start + 94))) { // && (view.getTop() < (start + 94))) {
mOriginY = (int) event.getY(); // mOriginY = (int) event.getY();
mDispatchY = eventY; // mDispatchY = eventY;
event.setLocation(event.getX(), mDispatchY); // event.setLocation(event.getX(), mDispatchY);
mDispatch = true; // mDispatch = true;
return mNotesListView.dispatchTouchEvent(event); // return mNotesListView.dispatchTouchEvent(event);
} // }
} // }
break; // break;
} // }
case MotionEvent.ACTION_MOVE: { // case MotionEvent.ACTION_MOVE: {
if (mDispatch) { // if (mDispatch) {
mDispatchY += (int) event.getY() - mOriginY; // mDispatchY += (int) event.getY() - mOriginY;
event.setLocation(event.getX(), mDispatchY); // event.setLocation(event.getX(), mDispatchY);
return mNotesListView.dispatchTouchEvent(event); // return mNotesListView.dispatchTouchEvent(event);
} // }
break; // break;
} // }
default: { // default: {
if (mDispatch) { // if (mDispatch) {
event.setLocation(event.getX(), mDispatchY); // event.setLocation(event.getX(), mDispatchY);
mDispatch = false; // mDispatch = false;
return mNotesListView.dispatchTouchEvent(event); // return mNotesListView.dispatchTouchEvent(event);
} // }
break; // break;
} // }
} // }
return false; // return false;
} // }
//
}; // };
private void startAsyncNotesListQuery() { private void startAsyncNotesListQuery() {
String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
@ -442,35 +449,24 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
mNotesListAdapter.getSelectedCount(), mNotesListAdapter.getSelectedCount(),
adapter.getFolderName(RecycleBinActivity.this, which)), adapter.getFolderName(RecycleBinActivity.this, which)),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
mModeCallBack.finishActionMode(); // mModeCallBack.finishActionMode();
} }
}); });
builder.show(); builder.show();
} }
private void createNewNote() { // private void createNewNote() {
Intent intent = new Intent(this, NoteEditActivity.class); // Intent intent = new Intent(this, NoteEditActivity.class);
intent.setAction(Intent.ACTION_INSERT_OR_EDIT); // intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId); // intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId);
this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE); // this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);
} // }
private void batchDelete() { private void batchDelete() {
// delete notes directly
if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ if (!DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
// if in trash, delete notes directly .getSelectedItemIds())) {
if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter Log.e(TAG, "Delete notes error, should not happens");
.getSelectedItemIds())) {
} else {
Log.e(TAG, "Delete notes error, should not happens");
}
}
else{
//move to trash
if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
.getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
Log.e(TAG, "Move notes to trash folder error, should not happens");
}
} }
} }
@ -484,7 +480,7 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
ids.add(folderId); ids.add(folderId);
HashSet<AppWidgetAttribute> widgets = DataUtils.getFolderNoteWidget(mContentResolver, HashSet<AppWidgetAttribute> widgets = DataUtils.getFolderNoteWidget(mContentResolver,
folderId); folderId);
if (true) { if (false) {
// if not synced, delete folder directly // if not synced, delete folder directly
DataUtils.batchDeleteNotes(mContentResolver, ids); DataUtils.batchDeleteNotes(mContentResolver, ids);
} else { } else {
@ -501,57 +497,60 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
} }
} }
private void openNode(NoteItemData data) { // private void openNode(NoteItemData data) {
Intent intent = new Intent(this, NoteEditActivity.class); // Intent intent = new Intent(this, NoteEditActivity.class);
intent.setAction(Intent.ACTION_VIEW); // intent.setAction(Intent.ACTION_VIEW);
intent.putExtra(Intent.EXTRA_UID, data.getId()); // intent.putExtra(Intent.EXTRA_UID, data.getId());
this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); // this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE);
} // }
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()) { // switch (v.getId()) {
case R.id.btn_new_note: // case R.id.btn_new_note:
createNewNote(); // createNewNote();
break; // break;
default: // default:
break; // break;
} // }
} }
private void showSoftInput() { // private void showSoftInput() {
InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); // InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
if (inputMethodManager != null) { // if (inputMethodManager != null) {
inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0); // inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
} // }
} // }
private void hideSoftInput(View view) { // private void hideSoftInput(View view) {
InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); // InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); // inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
} // }
@Override @Override
public void onBackPressed() { public void onBackPressed() {
switch (mState) { // switch (mState) {
case SUB_FOLDER: // case SUB_FOLDER:
mCurrentFolderId = Notes.ID_ROOT_FOLDER; // mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST; // mState = ListEditState.NOTE_LIST;
startAsyncNotesListQuery(); // startAsyncNotesListQuery();
mTitleBar.setVisibility(View.GONE); // mTitleBar.setVisibility(View.GONE);
break; // break;
case CALL_RECORD_FOLDER: // case CALL_RECORD_FOLDER:
mCurrentFolderId = Notes.ID_ROOT_FOLDER; // mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST; // mState = ListEditState.NOTE_LIST;
// mAddNewNote.setVisibility(View.VISIBLE); //// mAddNewNote.setVisibility(View.VISIBLE);
mTitleBar.setVisibility(View.GONE); // mTitleBar.setVisibility(View.GONE);
startAsyncNotesListQuery(); // startAsyncNotesListQuery();
break; // break;
case NOTE_LIST: // case NOTE_LIST:
super.onBackPressed(); // super.onBackPressed();
break; // break;
default: // default:
break; // break;
} // }
Intent intent=new Intent(RecycleBinActivity.this,NotesListActivity.class);
startActivity(intent);
finish();
} }
private void updateWidget(int appWidgetId, int appWidgetType) { private void updateWidget(int appWidgetId, int appWidgetType) {
@ -573,22 +572,22 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
setResult(RESULT_OK, intent); setResult(RESULT_OK, intent);
} }
private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() { // private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() {
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { // public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
if (mFocusNoteDataItem != null) { // if (mFocusNoteDataItem != null) {
menu.setHeaderTitle(mFocusNoteDataItem.getSnippet()); // menu.setHeaderTitle(mFocusNoteDataItem.getSnippet());
menu.add(0, MENU_FOLDER_VIEW, 0, R.string.menu_folder_view); // menu.add(0, MENU_FOLDER_VIEW, 0, R.string.menu_folder_view);
menu.add(0, MENU_FOLDER_DELETE, 0, R.string.menu_folder_delete); // menu.add(0, MENU_FOLDER_DELETE, 0, R.string.menu_folder_delete);
menu.add(0, MENU_FOLDER_CHANGE_NAME, 0, R.string.menu_folder_change_name); // menu.add(0, MENU_FOLDER_CHANGE_NAME, 0, R.string.menu_folder_change_name);
} // }
} // }
}; // };
@Override @Override
public void onContextMenuClosed(Menu menu) { public void onContextMenuClosed(Menu menu) {
if (mNotesListView != null) { // if (mNotesListView != null) {
mNotesListView.setOnCreateContextMenuListener(null); // mNotesListView.setOnCreateContextMenuListener(null);
} // }
super.onContextMenuClosed(menu); super.onContextMenuClosed(menu);
} }
@ -626,52 +625,123 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
return true; return true;
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.recyclebin_options,menu);
menuItem = menu.findItem(R.id.select_all);
return super.onCreateOptionsMenu(menu);
}
@Override @Override
public boolean onPrepareOptionsMenu(Menu menu) { public boolean onPrepareOptionsMenu(Menu menu) {
menu.clear(); menu.clear();
if (mState == ListEditState.NOTE_LIST) { getMenuInflater().inflate(R.menu.recyclebin_options, menu);
getMenuInflater().inflate(R.menu.note_list, menu);
// set sync or sync_cancel
menu.findItem(R.id.menu_sync).setTitle(
GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync); // View customView = LayoutInflater.from(RecycleBinActivity.this).inflate(
} else if (mState == ListEditState.SUB_FOLDER) { // R.layout.note_list_dropdown_menu, null);
getMenuInflater().inflate(R.menu.sub_folder, menu); // mode.setCustomView(customView);
} else if (mState == ListEditState.CALL_RECORD_FOLDER) { //
getMenuInflater().inflate(R.menu.call_record_folder, menu); // DropdownMenu mDropDownMenu = new DropdownMenu(RecycleBinActivity.this,
} else { // (Button) customView.findViewById(R.id.selection_menu),
Log.e(TAG, "Wrong state:" + mState); // R.menu.note_list_dropdown);
} // mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
// public boolean onMenuItemClick(MenuItem item) {
// mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
// updateMenu();
// return true;
// }
//
// });
// if (mState == ListEditState.NOTE_LIST) {
// getMenuInflater().inflate(R.menu.recyclebin_options, menu);
// // set sync or sync_cancel
//// menu.findItem(R.id.menu_sync).setTitle(
//// GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync);
// } else if (mState == ListEditState.SUB_FOLDER) {
// getMenuInflater().inflate(R.menu.sub_folder, menu);
// } else if (mState == ListEditState.CALL_RECORD_FOLDER) {
// getMenuInflater().inflate(R.menu.call_record_folder, menu);
// } else {
// Log.e(TAG, "Wrong state:" + mState);
// }
return true; return true;
} }
// private void startQueryDestinationFolders() {
// String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?";
// selection = (mState == RecycleBinActivity.ListEditState.NOTE_LIST) ? selection:
// "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")";
//
// mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN,
// null,
// Notes.CONTENT_NOTE_URI,
// FoldersListAdapter.PROJECTION,
// selection,
// new String[] {
// String.valueOf(Notes.TYPE_FOLDER),
// String.valueOf(Notes.ID_TRASH_FOLER),
// String.valueOf(mCurrentFolderId)
// },
// NoteColumns.MODIFIED_DATE + " DESC");
// }
/**
* 当顶部菜单项被选择时所执行的函数
*/
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { // switch (item.getItemId()) {
case R.id.menu_new_folder: { // case R.id.menu_new_folder: {
// showCreateOrModifyFolderDialog(true); //// showCreateOrModifyFolderDialog(true);
break; // break;
} // }
case R.id.menu_export_text: { // case R.id.menu_export_text: {
// exportNoteToText(); //// exportNoteToText();
break; // break;
} // }
case R.id.menu_setting: { // case R.id.menu_setting: {
startPreferenceActivity(); //// startPreferenceActivity();
break; // break;
// }
// case R.id.menu_new_note: {
//// createNewNote();
// break;
// }
// case R.id.menu_search:
// onSearchRequested();
// break;
//// case R.id.RecycleBin:
//// recycleBin();
//// break;
// default:
// break;
// }
// TODO: 2023/5/26 为这两个选项加入弹窗
if (item.getItemId() == R.id.recover) {
if (!DataUtils.batchMoveToFolder(mContentResolver,
mNotesListAdapter.getSelectedItemIds(), Notes.ID_ROOT_FOLDER))
Log.e(TAG, "Recover error, should not happens");
}
else if (item.getItemId() == R.id.realdelete) {
batchDelete();
}
else if (item.getItemId() == R.id.select_all) {
if (!mNotesListAdapter.isAllSelected()){
item.setTitle("deselect_all");
mNotesListAdapter.selectAll(true);
} }
case R.id.menu_new_note: { else {
createNewNote(); item.setTitle("selected_all");
break; mNotesListAdapter.selectAll(false);
} }
case R.id.menu_search: return true;
onSearchRequested();
break;
// case R.id.RecycleBin:
// recycleBin();
// break;
default:
break;
} }
reset_ChoiseMode();
return true; return true;
} }
@ -687,67 +757,71 @@ public class RecycleBinActivity extends Activity implements OnClickListener, OnI
return true; return true;
} }
private void startPreferenceActivity() { // private void startPreferenceActivity() {
Activity from = getParent() != null ? getParent() : this; // Activity from = getParent() != null ? getParent() : this;
Intent intent = new Intent(from, NotesPreferenceActivity.class); // Intent intent = new Intent(from, NotesPreferenceActivity.class);
from.startActivityIfNeeded(intent, -1); // from.startActivityIfNeeded(intent, -1);
} // }
private class OnListItemClickListener implements OnItemClickListener { private class OnListItemClickListener implements OnItemClickListener {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (view instanceof NotesListItem) { if (view instanceof NotesListItem) {
NoteItemData item = ((NotesListItem) view).getItemData(); NoteItemData item = ((NotesListItem) view).getItemData();
if (mNotesListAdapter.isInChoiceMode()) { if (item.getType() == Notes.TYPE_NOTE) {
if (item.getType() == Notes.TYPE_NOTE) { position = position - mNotesListView.getHeaderViewsCount();
position = position - mNotesListView.getHeaderViewsCount(); mNotesListAdapter.setCheckedItem(position, !mNotesListAdapter.isSelectedItem(position));
mModeCallBack.onItemCheckedStateChanged(null, position, id, if (mNotesListAdapter.isAllSelected())
!mNotesListAdapter.isSelectedItem(position)); menuItem.setTitle("unselected");
} // mModeCallBack.onItemCheckedStateChanged(null, position, id, !mNotesListAdapter.isSelectedItem(position));
return;
} }
switch (mState) { // switch (mState) {
case NOTE_LIST: // case NOTE_LIST:
if (item.getType() == Notes.TYPE_FOLDER // if (item.getType() == Notes.TYPE_FOLDER
|| item.getType() == Notes.TYPE_SYSTEM) { // || item.getType() == Notes.TYPE_SYSTEM) {
// openFolder(item); //// openFolder(item);
} else if (item.getType() == Notes.TYPE_NOTE) { // } else if (item.getType() == Notes.TYPE_NOTE) {
openNode(item); //// openNode(item);
} else { // } else {
Log.e(TAG, "Wrong note type in NOTE_LIST"); // Log.e(TAG, "Wrong note type in NOTE_LIST");
} // }
break; // break;
case SUB_FOLDER: // case SUB_FOLDER:
case CALL_RECORD_FOLDER: // case CALL_RECORD_FOLDER:
if (item.getType() == Notes.TYPE_NOTE) { // if (item.getType() == Notes.TYPE_NOTE) {
openNode(item); //// openNode(item);
} else { // } else {
Log.e(TAG, "Wrong note type in SUB_FOLDER"); // Log.e(TAG, "Wrong note type in SUB_FOLDER");
} // }
break; // break;
default: // default:
break; // break;
} // }
} }
} }
} }
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) { @Override
if (view instanceof NotesListItem) { public boolean onItemLongClick(AdapterView<?> adapterView, View view, int i, long l) {
mFocusNoteDataItem = ((NotesListItem) view).getItemData();
if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) {
if (mNotesListView.startActionMode(mModeCallBack) != null) {
mModeCallBack.onItemCheckedStateChanged(null, position, id, true);
mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
} else {
Log.e(TAG, "startActionMode fails");
}
} else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) {
mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener);
}
}
return false; return false;
} }
// public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
// if (view instanceof NotesListItem) {
// mFocusNoteDataItem = ((NotesListItem) view).getItemData();
// if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) {
// if (mNotesListView.startActionMode(mModeCallBack) != null) {
// mModeCallBack.onItemCheckedStateChanged(null, position, id, true);
// mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
// } else {
// Log.e(TAG, "startActionMode fails");
// }
// } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) {
// mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener);
// }
// }
// return false;
// }
} }

4
src/app/src/main/res/layout/note_list.xml
Unescape View File

@ -31,11 +31,11 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/title_bar_bg" android:background="@drawable/title_bar_bg"
android:visibility="gone"
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:textColor="#FFEAD1AE" android:textColor="#FFEAD1AE"
android:textSize="@dimen/text_font_size_medium" /> android:textSize="@dimen/text_font_size_medium"
android:visibility="gone" />
<ListView <ListView
android:id="@+id/notes_list" android:id="@+id/notes_list"

19
src/app/src/main/res/layout/recycle_bin.xml
Unescape View File

@ -2,6 +2,7 @@
<FrameLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="@drawable/list_background"> android:background="@drawable/list_background">
@ -9,28 +10,18 @@
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical"
tools:ignore="UselessParent">
<TextView
android:id="@+id/tv_title_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/title_bar_bg"
android:visibility="gone"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="#FFEAD1AE"
android:textSize="@dimen/text_font_size_medium" />
<ListView <ListView
android:id="@+id/notes_list" android:id="@+id/recycle_list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="1"
android:cacheColorHint="@null" android:cacheColorHint="@null"
android:listSelector="@android:color/transparent" android:listSelector="@android:color/transparent"
android:divider="@null" android:divider="@null"
android:fadingEdge="@null" /> android:fadingEdge="none" />
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

21
src/app/src/main/res/menu/recyclebin_options.xml
Unescape View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/select_all"
android:title="@android:string/selectAll"
android:showAsAction="always"/>
<item
android:id="@+id/recover"
android:title="@string/recover"
android:icon="@drawable/menu_move"
android:showAsAction="always" />
<item
android:id="@+id/realdelete"
android:title="@string/realdelete"
android:icon="@drawable/menu_delete"
android:showAsAction="always" />
</menu>

2
src/app/src/main/res/values/strings.xml
Unescape View File

@ -126,6 +126,8 @@
<string name="search">Notes</string> <string name="search">Notes</string>
<string name="datetime_dialog_ok">set</string> <string name="datetime_dialog_ok">set</string>
<string name="datetime_dialog_cancel">cancel</string> <string name="datetime_dialog_cancel">cancel</string>
<string name="realdelete">realdelete</string>
<string name="recover">recover</string>
<plurals name="search_results_title"> <plurals name="search_results_title">
<item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item> <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
<!-- Case of 0 or 2 or more results. --> <!-- Case of 0 or 2 or more results. -->

Write Preview
Loading…
Cancel
Save