From cb1deb25f64097e7346d74592acbf52d49301fcb Mon Sep 17 00:00:00 2001 From: korelstar Date: Wed, 15 Nov 2017 08:24:48 +0100 Subject: [PATCH] refactor NoteFragments, category in ActionBar --- app/src/main/AndroidManifest.xml | 2 +- .../android/activity/EditNoteActivity.java | 248 +++++------------- .../activity/NotesListViewActivity.java | 20 +- .../android/fragment/BaseNoteFragment.java | 171 ++++++++++++ .../fragment/CategoryDialogFragment.java | 2 +- .../android/fragment/NoteEditFragment.java | 87 +----- .../notes/android/fragment/NoteFragmentI.java | 7 - .../android/fragment/NotePreviewFragment.java | 33 +-- .../notes/model/NoteListWidgetFactory.java | 2 +- .../notes/model/SingleNoteWidgetFactory.java | 2 +- .../persistence/NoteSQLiteOpenHelper.java | 1 - app/src/main/res/menu/menu_note_activity.xml | 19 ++ ...e_list_view.xml => menu_note_fragment.xml} | 18 -- 13 files changed, 282 insertions(+), 330 deletions(-) create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteFragmentI.java create mode 100644 app/src/main/res/menu/menu_note_activity.xml rename app/src/main/res/menu/{menu_note_list_view.xml => menu_note_fragment.xml} (66%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 45663fe75..ad33390f8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -72,7 +72,7 @@ android:label="@string/menu_edit" android:parentActivityName="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity" android:windowSoftInputMode="stateHidden" - android:launchMode="singleInstance" + android:launchMode="singleTask" /> notePosition) { - Item oldItem = adapter.getItem(notePosition); - if (resultCode == RESULT_FIRST_USER) { - adapter.remove(oldItem); - } - if (resultCode == RESULT_OK) { - DBNote editedNote = (DBNote) data.getExtras().getSerializable(EditNoteActivity.PARAM_NOTE); - adapter.replace(editedNote, notePosition); - refreshLists(); - } - } - } } else if (requestCode == server_settings) { // Create new Instance with new URL and credentials db = NoteSQLiteOpenHelper.getInstance(this); @@ -598,10 +583,9 @@ public void onNoteClick(int position, View v) { mActionMode.finish(); } } else { - Item item = adapter.getItem(position); + DBNote note = (DBNote) adapter.getItem(position); Intent intent = new Intent(getApplicationContext(), EditNoteActivity.class); - intent.putExtra(EditNoteActivity.PARAM_NOTE, (DBNote) item); - intent.putExtra(EditNoteActivity.PARAM_NOTE_POSITION, position); + intent.putExtra(EditNoteActivity.PARAM_NOTE_ID, note.getId()); startActivityForResult(intent, show_single_note_cmd); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java new file mode 100644 index 000000000..43ff561ee --- /dev/null +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java @@ -0,0 +1,171 @@ +package it.niedermann.owncloud.notes.android.fragment; + +import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentManager; +import android.content.Intent; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.util.Log; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; + +import it.niedermann.owncloud.notes.R; +import it.niedermann.owncloud.notes.model.DBNote; +import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper; +import it.niedermann.owncloud.notes.util.ICallback; + +public abstract class BaseNoteFragment extends Fragment implements CategoryDialogFragment.CategoryDialogListener { + + public interface NoteFragmentListener { + void close(); + void onNoteUpdated(DBNote note); + } + + public static final String PARAM_NOTE_ID = "noteId"; + private static final String SAVEDKEY_NOTE = "note"; + private static final String SAVEDKEY_ORIGINAL_NOTE = "original_note"; + + protected DBNote note; + private DBNote originalNote; + private NoteSQLiteOpenHelper db; + private NoteFragmentListener listener; + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if(savedInstanceState==null) { + long id = getArguments().getLong(PARAM_NOTE_ID); + note = originalNote = db.getNote(id); + } else { + note = (DBNote) savedInstanceState.getSerializable(SAVEDKEY_NOTE); + originalNote = (DBNote) savedInstanceState.getSerializable(SAVEDKEY_ORIGINAL_NOTE); + } + setHasOptionsMenu(true); + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + try { + listener = (NoteFragmentListener) activity; + } catch(ClassCastException e) { + throw new ClassCastException(activity.getClass()+" must implement "+NoteFragmentListener.class); + } + db = NoteSQLiteOpenHelper.getInstance(activity); + } + + @Override + public void onResume() { + super.onResume(); + listener.onNoteUpdated(note); + } + + @Override + public void onDetach() { + super.onDetach(); + listener = null; + } + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putSerializable(SAVEDKEY_NOTE, note); + outState.putSerializable(SAVEDKEY_ORIGINAL_NOTE, originalNote); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + inflater.inflate(R.menu.menu_note_fragment, menu); + } + + @Override + public void onPrepareOptionsMenu(Menu menu) { + super.onPrepareOptionsMenu(menu); + MenuItem itemFavorite = menu.findItem(R.id.menu_favorite); + prepareFavoriteOption(itemFavorite); + } + + private void prepareFavoriteOption(MenuItem item) { + item.setIcon(note.isFavorite() ? R.drawable.ic_star_white_24dp : R.drawable.ic_star_outline_white_24dp); + item.setChecked(note.isFavorite()); + } + + /** + * Main-Menu-Handler + */ + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.menu_cancel: + db.updateNoteAndSync(originalNote, null, null); + listener.close(); + return true; + case R.id.menu_delete: + db.deleteNoteAndSync(originalNote.getId()); + listener.close(); + return true; + case R.id.menu_favorite: + db.toggleFavorite(note, null); + listener.onNoteUpdated(note); + prepareFavoriteOption(item); + return true; + case R.id.menu_category: + showCategorySelector(); + return true; + case R.id.menu_share: + Intent shareIntent = new Intent(); + shareIntent.setAction(Intent.ACTION_SEND); + shareIntent.setType("text/plain"); + shareIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, note.getTitle()); + shareIntent.putExtra(android.content.Intent.EXTRA_TEXT, note.getContent()); + startActivity(shareIntent); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + + public void onPrepareClose() { + saveNote(null); + } + + /** + * Save the current state in the database and schedule synchronization if needed. + * + * @param callback Observer which is called after save/synchronization + */ + protected void saveNote(@Nullable ICallback callback) { + Log.d(getClass().getSimpleName(), "saveData()"); + note = db.updateNoteAndSync(note, getContent(), callback); + db.updateSingleNoteWidgets(); + db.updateNoteListWidgets(); + listener.onNoteUpdated(note); + } + protected abstract String getContent(); + + /** + * Opens a dialog in order to chose a category + */ + private void showCategorySelector() { + final String fragmentId = "fragment_category"; + FragmentManager manager = getFragmentManager(); + Fragment frag = manager.findFragmentByTag(fragmentId); + if(frag!=null) { + manager.beginTransaction().remove(frag).commit(); + } + Bundle arguments = new Bundle(); + arguments.putString(CategoryDialogFragment.PARAM_CATEGORY, note.getCategory()); + CategoryDialogFragment categoryFragment = new CategoryDialogFragment(); + categoryFragment.setArguments(arguments); + categoryFragment.setTargetFragment(this, 0); + categoryFragment.show(manager, fragmentId); + } + + @Override + public void onCategoryChosen(String category) { + db.setCategory(note, category, null); + listener.onNoteUpdated(note); + } +} diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java index d884ba0e7..44a9a47fb 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java @@ -155,7 +155,7 @@ protected FilterResults performFiltering(CharSequence prefix) { for (int i = 0; i < count; i++) { final String value = originalData.get(i); - final String valueText = value.toString().toLowerCase(); + final String valueText = value.toLowerCase(); // First match against the whole, non-splitted value if (valueText.startsWith(prefixString)) { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java index 816de009a..76d50e440 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java @@ -1,12 +1,9 @@ package it.niedermann.owncloud.notes.android.fragment; -import android.app.Fragment; import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; @@ -21,47 +18,31 @@ import com.yydcdut.rxmarkdown.syntax.edit.EditFactory; import it.niedermann.owncloud.notes.R; -import it.niedermann.owncloud.notes.model.DBNote; -import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper; import it.niedermann.owncloud.notes.util.ICallback; import it.niedermann.owncloud.notes.util.MarkDownUtil; import rx.Subscriber; -public class NoteEditFragment extends Fragment implements NoteFragmentI { +public class NoteEditFragment extends BaseNoteFragment { - public static final String PARAM_NOTE = "note"; - - private static final String LOG_TAG = "NoteEditFragment"; private static final String LOG_TAG_AUTOSAVE = "AutoSave"; private static final long DELAY = 2000; // Wait for this time after typing before saving private static final long DELAY_AFTER_SYNC = 5000; // Wait for this time after saving before checking for next save - private static final long DELAY_SHOW_SAVED = 1000; // How long "saved" is shown - private DBNote note; - private NoteSQLiteOpenHelper db; private Handler handler; private boolean saveActive, unsavedEdit; - public static NoteEditFragment newInstance(DBNote note) { + public static NoteEditFragment newInstance(long noteId) { NoteEditFragment f = new NoteEditFragment(); Bundle b = new Bundle(); - b.putSerializable(PARAM_NOTE, note); + b.putSerializable(PARAM_NOTE_ID, noteId); f.setArguments(b); return f; } - public DBNote getNote() { - cancelTimers(); - if (!getContent().equals(note.getContent())) - saveData(null); - return note; - } - @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setHasOptionsMenu(true); handler = new Handler(Looper.getMainLooper()); } @@ -82,9 +63,6 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - note = (DBNote) getArguments().getSerializable(PARAM_NOTE); - db = NoteSQLiteOpenHelper.getInstance(getActivity()); - // workaround for issue yydcdut/RxMarkdown#41 note.setContent(note.getContent().replace("\r\n", "\n")); @@ -156,22 +134,8 @@ public void run() { } }; - private final Runnable runResetActionBar = new Runnable() { - @Override - public void run() { - ActionBar actionBar = getActionBar(); - if(actionBar == null) { - Log.w(LOG_TAG_AUTOSAVE, "runResetActionBar: ActionBar NOT AVAILABLE!"); - return; - } - Log.d(LOG_TAG_AUTOSAVE, "runResetActionBar: reset action bar"); - actionBar.setSubtitle(getString(R.string.action_edit_editing)); - } - }; - private void cancelTimers() { handler.removeCallbacks(runAutoSave); - handler.removeCallbacks(runResetActionBar); } private RxMDEditText getContentView() { @@ -183,16 +147,15 @@ private RxMDEditText getContentView() { * * @return String of the current content. */ - private String getContent() { + @Override + protected String getContent() { return getContentView().getText().toString(); } - private ActionBar getActionBar() { - AppCompatActivity activity = (AppCompatActivity) getActivity(); - if(activity == null) { - return null; - } - return activity.getSupportActionBar(); + @Override + protected void saveNote(@Nullable ICallback callback) { + super.saveNote(callback); + unsavedEdit = false; } /** @@ -200,17 +163,8 @@ private ActionBar getActionBar() { */ private void autoSave() { Log.d(LOG_TAG_AUTOSAVE, "STARTAUTOSAVE"); - ActionBar actionBar = getActionBar(); - // if fragment is not attached to activity, then there is nothing to save - if (getActivity() == null) { - Log.w(LOG_TAG_AUTOSAVE, "autoSave: Activity NOT AVAILABLE!"); - return; - } saveActive = true; - if (actionBar != null) { - actionBar.setSubtitle(getString(R.string.action_edit_saving)); - } - saveData(new ICallback() { + saveNote(new ICallback() { @Override public void onFinish() { onSaved(); @@ -225,16 +179,6 @@ private void onSaved() { // AFTER SYNCHRONIZATION Log.d(LOG_TAG_AUTOSAVE, "FINISHED AUTOSAVE"); saveActive = false; - ActionBar actionBar = getActionBar(); - if (actionBar == null) { - Log.w(LOG_TAG_AUTOSAVE, "autoSave/onSaved: ActionBar NOT AVAILABLE!"); - return; - } - actionBar.setTitle(note.getTitle()); - actionBar.setSubtitle(getResources().getString(R.string.action_edit_saved)); - - // AFTER "DELAY_SHOW_SAVED": set ActionBar to default title - handler.postDelayed(runResetActionBar, DELAY_SHOW_SAVED); // AFTER "DELAY_AFTER_SYNC" SECONDS: allow next auto-save or start it directly handler.postDelayed(runAutoSave, DELAY_AFTER_SYNC); @@ -242,15 +186,4 @@ private void onSaved() { } }); } - - /** - * Save the current state in the database and schedule synchronization if needed. - * - * @param callback Observer which is called after save/synchronization - */ - private void saveData(ICallback callback) { - Log.d(LOG_TAG, "saveData()"); - note = db.updateNoteAndSync(note, getContent(), callback); - unsavedEdit = false; - } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteFragmentI.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteFragmentI.java deleted file mode 100644 index 44c27ddbe..000000000 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteFragmentI.java +++ /dev/null @@ -1,7 +0,0 @@ -package it.niedermann.owncloud.notes.android.fragment; - -import it.niedermann.owncloud.notes.model.DBNote; - -public interface NoteFragmentI { - public DBNote getNote(); -} diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java index a4fcc2b13..815212a09 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java @@ -1,14 +1,11 @@ package it.niedermann.owncloud.notes.android.fragment; -import android.app.Fragment; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.text.method.LinkMovementMethod; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; @@ -19,38 +16,21 @@ import com.yydcdut.rxmarkdown.syntax.text.TextFactory; import it.niedermann.owncloud.notes.R; -import it.niedermann.owncloud.notes.android.activity.EditNoteActivity; -import it.niedermann.owncloud.notes.model.DBNote; import it.niedermann.owncloud.notes.util.MarkDownUtil; import rx.Subscriber; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class NotePreviewFragment extends Fragment implements NoteFragmentI { +public class NotePreviewFragment extends BaseNoteFragment { - public static final String PARAM_NOTE = EditNoteActivity.PARAM_NOTE; - - private DBNote note = null; - - public static NotePreviewFragment newInstance(DBNote note) { + public static NotePreviewFragment newInstance(long noteId) { NotePreviewFragment f = new NotePreviewFragment(); Bundle b = new Bundle(); - b.putSerializable(PARAM_NOTE, note); + b.putSerializable(PARAM_NOTE_ID, noteId); f.setArguments(b); return f; } - @Override - public DBNote getNote() { - return note; - } - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setHasOptionsMenu(true); - } - @Override public void onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); @@ -70,8 +50,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); - note = (DBNote) getArguments().getSerializable(PARAM_NOTE); - final RxMDTextView noteContent = (RxMDTextView) getActivity().findViewById(R.id.single_note_content); + final RxMDTextView noteContent = getActivity().findViewById(R.id.single_note_content); String content = note.getContent(); /* @@ -113,4 +92,8 @@ public void onNext(CharSequence charSequence) { ((TextView) getActivity().findViewById(R.id.single_note_content)).setMovementMethod(LinkMovementMethod.getInstance()); } + @Override + protected String getContent() { + return note.getContent(); + } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/NoteListWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/model/NoteListWidgetFactory.java index 0d518bebc..6f9531fce 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/model/NoteListWidgetFactory.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/model/NoteListWidgetFactory.java @@ -70,7 +70,7 @@ public RemoteViews getViewAt(int i) { final Intent fillInIntent = new Intent(); final Bundle extras = new Bundle(); - extras.putSerializable(EditNoteActivity.PARAM_NOTE, note); + extras.putLong(EditNoteActivity.PARAM_NOTE_ID, note.getId()); fillInIntent.putExtras(extras); fillInIntent.setData(Uri.parse(fillInIntent.toUri(Intent.URI_INTENT_SCHEME))); note_content.setOnClickFillInIntent(R.id.widget_note_list_entry, fillInIntent); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/SingleNoteWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/model/SingleNoteWidgetFactory.java index dacd71a23..4fe146f6f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/model/SingleNoteWidgetFactory.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/model/SingleNoteWidgetFactory.java @@ -98,7 +98,7 @@ public RemoteViews getViewAt(int position) { final Intent fillInIntent = new Intent(); final Bundle extras = new Bundle(); - extras.putSerializable(EditNoteActivity.PARAM_NOTE, note); + extras.putLong(EditNoteActivity.PARAM_NOTE_ID, note.getId()); fillInIntent.putExtras(extras); fillInIntent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY); note_content.setOnClickFillInIntent(R.id.single_note_content_tv, fillInIntent); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java index 234216e63..fd474d518 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java @@ -218,7 +218,6 @@ long addNote(CloudNote note) { * @param id int - ID of the requested Note * @return requested Note */ - @SuppressWarnings("unused") public DBNote getNote(long id) { List notes = getNotesCustom(key_id + " = ? AND " + key_status + " != ?", new String[]{String.valueOf(id), DBStatus.LOCAL_DELETED.getTitle()}, null); return notes.isEmpty() ? null : notes.get(0); diff --git a/app/src/main/res/menu/menu_note_activity.xml b/app/src/main/res/menu/menu_note_activity.xml new file mode 100644 index 000000000..4562d1203 --- /dev/null +++ b/app/src/main/res/menu/menu_note_activity.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_note_list_view.xml b/app/src/main/res/menu/menu_note_fragment.xml similarity index 66% rename from app/src/main/res/menu/menu_note_list_view.xml rename to app/src/main/res/menu/menu_note_fragment.xml index 34122d5ac..4aa0c7359 100644 --- a/app/src/main/res/menu/menu_note_list_view.xml +++ b/app/src/main/res/menu/menu_note_fragment.xml @@ -1,18 +1,6 @@ - - -