mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-10-25 22:26:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove Butterknife from NoteReadonlyFragment

Browse source
This commit is contained in:
Christoph Loy 2020-02-25 19:07:51 +01:00 committed by Niedermann IT-Dienstleistungen
parent ba3cfe512b
commit b3ace46318
1 changed files with 20 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteReadonlyFragment.java
View file

@ -21,17 +21,14 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.yydcdut.markdown.MarkdownProcessor;
import com.yydcdut.markdown.MarkdownTextView;
import com.yydcdut.markdown.syntax.text.TextFactory;
import butterknife.BindView;
import butterknife.ButterKnife;
import it.niedermann.owncloud.notes.R;
import it.niedermann.owncloud.notes.android.activity.EditNoteActivity;
import it.niedermann.owncloud.notes.databinding.FragmentNotePreviewBinding;
import it.niedermann.owncloud.notes.model.ISyncCallback;
import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
import it.niedermann.owncloud.notes.util.DisplayUtils;
@ -42,20 +39,7 @@ public class NoteReadonlyFragment extends SearchableBaseNoteFragment {
private MarkdownProcessor markdownProcessor;
@BindView(R.id.swiperefreshlayout)
SwipeRefreshLayout swipeRefreshLayout;
@BindView(R.id.scrollView)
ScrollView scrollView;
@BindView(R.id.searchNext)
FloatingActionButton searchNext;
@BindView(R.id.searchPrev)
FloatingActionButton searchPrev;
@BindView(R.id.single_note_content)
MarkdownTextView noteContent;
private FragmentNotePreviewBinding binding;
public static NoteReadonlyFragment newInstance(String content) {
NoteReadonlyFragment f = new NoteReadonlyFragment();
@ -76,46 +60,46 @@ public class NoteReadonlyFragment extends SearchableBaseNoteFragment {
menu.findItem(R.id.menu_share).setVisible(false);
menu.findItem(R.id.menu_move).setVisible(false);
menu.findItem(R.id.menu_category).setVisible(false);
if(menu.findItem(MENU_ID_PIN) != null)
menu.findItem(MENU_ID_PIN).setVisible(false);
if (menu.findItem(MENU_ID_PIN) != null)
menu.findItem(MENU_ID_PIN).setVisible(false);
}
@Override
public ScrollView getScrollView() {
return scrollView;
return binding.scrollView;
}
@Override
protected FloatingActionButton getSearchNextButton() {
return searchNext;
return binding.searchNext;
}
@Override
protected FloatingActionButton getSearchPrevButton() {
return searchPrev;
return binding.searchPrev;
}
@Override
protected Layout getLayout() {
noteContent.onPreDraw();
return noteContent.getLayout();
binding.singleNoteContent.onPreDraw();
return binding.singleNoteContent.getLayout();
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup
container, @Nullable Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_note_preview, container, false);
binding = FragmentNotePreviewBinding.inflate(inflater, container, false);
return binding.getRoot();
}
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
ButterKnife.bind(this, requireView());
markdownProcessor = new MarkdownProcessor(requireActivity());
markdownProcessor.factory(TextFactory.create());
markdownProcessor.config(
MarkDownUtil.getMarkDownConfiguration(noteContent.getContext())
MarkDownUtil.getMarkDownConfiguration(binding.singleNoteContent.getContext())
.setOnLinkClickCallback((view, link) -> {
if (NoteLinksUtils.isNoteLink(link)) {
long noteRemoteId = NoteLinksUtils.extractNoteRemoteId(link);
@ -130,22 +114,22 @@ public class NoteReadonlyFragment extends SearchableBaseNoteFragment {
})
.build());
try {
noteContent.setText(markdownProcessor.parse(note.getContent()));
binding.singleNoteContent.setText(markdownProcessor.parse(note.getContent()));
onResume();
} catch (StringIndexOutOfBoundsException e) {
// Workaround for RxMarkdown: https://github.com/stefan-niedermann/nextcloud-notes/issues/668
Toast.makeText(noteContent.getContext(), R.string.could_not_load_preview_two_digit_numbered_list, Toast.LENGTH_LONG).show();
Toast.makeText(binding.singleNoteContent.getContext(), R.string.could_not_load_preview_two_digit_numbered_list, Toast.LENGTH_LONG).show();
e.printStackTrace();
}
noteContent.setMovementMethod(LinkMovementMethod.getInstance());
binding.singleNoteContent.setMovementMethod(LinkMovementMethod.getInstance());
db = NoteSQLiteOpenHelper.getInstance(getActivity());
swipeRefreshLayout.setEnabled(false);
binding.swiperefreshlayout.setEnabled(false);
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(requireActivity().getApplicationContext());
noteContent.setTextSize(TypedValue.COMPLEX_UNIT_PX, getFontSizeFromPreferences(sp));
binding.singleNoteContent.setTextSize(TypedValue.COMPLEX_UNIT_PX, getFontSizeFromPreferences(sp));
if (sp.getBoolean(getString(R.string.pref_key_font), false)) {
noteContent.setTypeface(Typeface.MONOSPACE);
binding.singleNoteContent.setTypeface(Typeface.MONOSPACE);
}
}
@ -161,8 +145,8 @@ public class NoteReadonlyFragment extends SearchableBaseNoteFragment {
@Override
protected void colorWithText(String newText) {
if (noteContent != null && ViewCompat.isAttachedToWindow(noteContent)) {
noteContent.setText(markdownProcessor.parse(DisplayUtils.searchAndColor(getContent(), new SpannableString
if (binding != null && ViewCompat.isAttachedToWindow(binding.singleNoteContent)) {
binding.singleNoteContent.setText(markdownProcessor.parse(DisplayUtils.searchAndColor(getContent(), new SpannableString
(getContent()), newText, getResources().getColor(R.color.primary))),
TextView.BufferType.SPANNABLE);
}