mirror of
https://github.com/nextcloud/notes-android.git
synced 2024-10-25 22:26:00 +03:00
Fix all the things
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
6e88c2ac93
commit
1b7ee1a695
3 changed files with 11 additions and 3 deletions
|
@ -54,6 +54,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
|
|||
private NoteFragmentListener listener;
|
||||
|
||||
private TextView activeTextView;
|
||||
private boolean isNew;
|
||||
|
||||
@Override
|
||||
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
|
||||
|
@ -62,6 +63,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
|
|||
if (savedInstanceState != null) {
|
||||
searchQuery = savedInstanceState.getString("searchQuery", "");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected void setActiveTextView(TextView textView) {
|
||||
|
@ -72,6 +74,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
|
|||
public void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (savedInstanceState == null) {
|
||||
isNew = true;
|
||||
long id = getArguments().getLong(PARAM_NOTE_ID);
|
||||
if (id > 0) {
|
||||
note = originalNote = db.getNote(id);
|
||||
|
@ -84,6 +87,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
|
|||
originalNote = null;
|
||||
}
|
||||
} else {
|
||||
isNew = false;
|
||||
note = (DBNote) savedInstanceState.getSerializable(SAVEDKEY_NOTE);
|
||||
originalNote = (DBNote) savedInstanceState.getSerializable(SAVEDKEY_ORIGINAL_NOTE);
|
||||
}
|
||||
|
@ -146,7 +150,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
|
|||
searchMenuItem = menu.findItem(R.id.search);
|
||||
searchView = (android.support.v7.widget.SearchView) searchMenuItem.getActionView();
|
||||
|
||||
if (!TextUtils.isEmpty(searchQuery)) {
|
||||
if (!TextUtils.isEmpty(searchQuery) && isNew) {
|
||||
searchMenuItem.expandActionView();
|
||||
searchView.setQuery(searchQuery, true);
|
||||
searchView.clearFocus();
|
||||
|
@ -154,6 +158,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
|
|||
searchMenuItem.collapseActionView();
|
||||
}
|
||||
|
||||
|
||||
final LinearLayout searchEditFrame = searchView.findViewById(android.support.v7.appcompat.R.id
|
||||
.search_edit_frame);
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ import android.os.Handler;
|
|||
import android.os.Looper;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.text.Editable;
|
||||
import android.text.TextUtils;
|
||||
import android.text.TextWatcher;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
|
@ -95,6 +96,10 @@ public class NoteEditFragment extends BaseNoteFragment {
|
|||
super.onPrepareOptionsMenu(menu);
|
||||
menu.findItem(R.id.menu_edit).setVisible(false);
|
||||
menu.findItem(R.id.menu_preview).setVisible(true);
|
||||
|
||||
if (TextUtils.isEmpty(searchQuery)) {
|
||||
searchMenuItem.collapseActionView();
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
|
|
@ -27,12 +27,10 @@ public class NotePreviewFragment extends BaseNoteFragment {
|
|||
@BindView(R.id.single_note_content)
|
||||
RxMDTextView noteContent;
|
||||
|
||||
private static boolean isNewFragment = false;
|
||||
public static NotePreviewFragment newInstance(long noteId) {
|
||||
NotePreviewFragment f = new NotePreviewFragment();
|
||||
Bundle b = new Bundle();
|
||||
b.putLong(PARAM_NOTE_ID, noteId);
|
||||
isNewFragment = true;
|
||||
f.setArguments(b);
|
||||
return f;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue