Move RxMarkdown-Configuration back to util class (7ea70f62) · Commits · e / os / Notes

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ public class NoteEditFragment extends BaseNoteFragment {
		editContent.setEnabled(true);

		RxMarkdown.live(editContent)
		.config(MarkDownUtil.getMarkDownConfiguration(getActivity().getApplicationContext()))
		.config(MarkDownUtil.getMarkDownConfiguration(getActivity().getApplicationContext()).build())
		.factory(EditFactory.create())
		.intoObservable()
		.subscribe(new Subscriber<CharSequence>() {

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java

+9 −13

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import butterknife.BindView;
		import butterknife.ButterKnife;
		import it.niedermann.owncloud.notes.R;
		import it.niedermann.owncloud.notes.util.ICallback;
		import it.niedermann.owncloud.notes.util.MarkDownUtil;
		import rx.Subscriber;
		import rx.android.schedulers.AndroidSchedulers;
		import rx.schedulers.Schedulers;
		@@ -75,27 +76,22 @@ public class NotePreviewFragment extends BaseNoteFragment {
		content = content.replaceAll("(?<![(])(https?://[-a-zA-Z0-9+&@#/%?=~_\|!:,.;][-a-zA-Z0-9+&@#/%=~_\|])(?![^\\[]\\])", "[$1]($1)");

		RxMarkdown.with(content, getActivity())
		.config(new RxMDConfiguration.Builder(getActivity().getApplicationContext())
		.setHeader2RelativeSize(1.35f)
		.setHeader3RelativeSize(1.25f)
		.setHeader4RelativeSize(1.15f)
		.setHeader5RelativeSize(1.1f)
		.setHeader6RelativeSize(1.05f)
		.setHorizontalRulesHeight(2)
		.config(
		MarkDownUtil.getMarkDownConfiguration(getActivity().getApplicationContext())
		.setOnTodoClickCallback(new OnTodoClickCallback() {
		@Override
		public CharSequence onTodoClicked(View view, String line, int lineNumber) {
		String[] lines = TextUtils.split(note.getContent(), "\\r?\\n");
		if(lines.length >= lineNumber) {
		lines[lineNumber] = line + lines[lineNumber].charAt(lines[lineNumber].length() - 1);
		lines[lineNumber] = line;
		}
		noteContent.setText(TextUtils.join("\n", lines), TextView.BufferType.SPANNABLE);
		saveNote(null);
		return line;
		}
		})
		.setLinkFontColor(ResourcesCompat.getColor(getActivity().getApplicationContext().getResources(), R.color.primary, null))
		.build())
		}
		).build()
		)
		.factory(TextFactory.create())
		.intoObservable()
		.subscribeOn(Schedulers.computation())

app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ import android.content.Context;
		import android.support.v4.content.res.ResourcesCompat;

		import com.yydcdut.rxmarkdown.RxMDConfiguration;
		import com.yydcdut.rxmarkdown.RxMDConfiguration.Builder;

		import it.niedermann.owncloud.notes.R;

		@@ -19,7 +20,7 @@ public class MarkDownUtil {
		* @param context Context
		* @return RxMDConfiguration
		*/
		public static RxMDConfiguration getMarkDownConfiguration(Context context) {
		public static Builder getMarkDownConfiguration(Context context) {
		return new RxMDConfiguration.Builder(context)
		.setUnOrderListColor(ResourcesCompat.getColor(context.getResources(), R.color.fg_default, null))
		.setHeader2RelativeSize(1.35f)
		@@ -28,7 +29,6 @@ public class MarkDownUtil {
		.setHeader5RelativeSize(1.1f)
		.setHeader6RelativeSize(1.05f)
		.setHorizontalRulesHeight(2)
		.setLinkFontColor(ResourcesCompat.getColor(context.getResources(), R.color.primary, null))
		.build();
		.setLinkFontColor(ResourcesCompat.getColor(context.getResources(), R.color.primary, null));
		}
		}

cert4android @ 0d12bf44

Original line number	Diff line number	Diff line
		Subproject commit 4e52388dccfed8afbfba0dfc509a54025ade300c
		Subproject commit 0d12bf44ec340004f1f062d2f6b8a12e13a49385