the-btfash-foundation/Markwon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update imports from sample and make use of Java 8

Browse Source
This commit is contained in:
Stefan Niedermann 2020-12-27 12:56:48 +01:00
parent 7cc74d7b22
commit 51818a014a
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app-sample/src/main/java/io/noties/markwon/app/samples/editor/EditorHeadingSample.java
View File

@ -5,7 +5,7 @@ import java.util.concurrent.Executors;
import io.noties.markwon.Markwon; import io.noties.markwon.Markwon;
import io.noties.markwon.app.sample.Tags; import io.noties.markwon.app.sample.Tags;
import io.noties.markwon.app.samples.editor.shared.MarkwonEditTextSample; import io.noties.markwon.app.samples.editor.shared.MarkwonEditTextSample;
import io.noties.markwon.app.samples.editor.shared.HeadingEditHandler; import io.noties.markwon.editor.handler.HeadingEditHandler;
import io.noties.markwon.editor.MarkwonEditor; import io.noties.markwon.editor.MarkwonEditor;
import io.noties.markwon.editor.MarkwonEditorTextWatcher; import io.noties.markwon.editor.MarkwonEditorTextWatcher;
import io.noties.markwon.sample.annotations.MarkwonArtifact; import io.noties.markwon.sample.annotations.MarkwonArtifact;

2
app-sample/src/main/java/io/noties/markwon/app/samples/editor/WYSIWYGEditorSample.java
View File

@ -15,7 +15,6 @@ import io.noties.markwon.SoftBreakAddsNewLinePlugin;
import io.noties.markwon.app.sample.Tags; import io.noties.markwon.app.sample.Tags;
import io.noties.markwon.app.samples.editor.shared.BlockQuoteEditHandler; import io.noties.markwon.app.samples.editor.shared.BlockQuoteEditHandler;
import io.noties.markwon.app.samples.editor.shared.CodeEditHandler; import io.noties.markwon.app.samples.editor.shared.CodeEditHandler;
import io.noties.markwon.app.samples.editor.shared.HeadingEditHandler;
import io.noties.markwon.app.samples.editor.shared.LinkEditHandler; import io.noties.markwon.app.samples.editor.shared.LinkEditHandler;
import io.noties.markwon.app.samples.editor.shared.MarkwonEditTextSample; import io.noties.markwon.app.samples.editor.shared.MarkwonEditTextSample;
import io.noties.markwon.app.samples.editor.shared.StrikethroughEditHandler; import io.noties.markwon.app.samples.editor.shared.StrikethroughEditHandler;
@ -23,6 +22,7 @@ import io.noties.markwon.editor.MarkwonEditor;
import io.noties.markwon.editor.MarkwonEditorTextWatcher; import io.noties.markwon.editor.MarkwonEditorTextWatcher;
import io.noties.markwon.editor.PersistedSpans; import io.noties.markwon.editor.PersistedSpans;
import io.noties.markwon.editor.handler.EmphasisEditHandler; import io.noties.markwon.editor.handler.EmphasisEditHandler;
import io.noties.markwon.editor.handler.HeadingEditHandler;
import io.noties.markwon.editor.handler.StrongEmphasisEditHandler; import io.noties.markwon.editor.handler.StrongEmphasisEditHandler;
import io.noties.markwon.sample.annotations.MarkwonArtifact; import io.noties.markwon.sample.annotations.MarkwonArtifact;
import io.noties.markwon.sample.annotations.MarkwonSampleInfo; import io.noties.markwon.sample.annotations.MarkwonSampleInfo;

5
markwon-editor/build.gradle
View File

@ -11,6 +11,11 @@ android {
versionCode 1 versionCode 1
versionName version versionName version
} }
compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
} }
dependencies { dependencies {

29
markwon-editor/src/main/java/io/noties/markwon/editor/handler/HeadingEditHandler.java
View File

@ -1,4 +1,4 @@
package it.niedermann.android.markdown.markwon.handler; package io.noties.markwon.editor.handler;
import android.text.Editable; import android.text.Editable;
import android.text.Spanned; import android.text.Spanned;
@ -13,7 +13,6 @@ import io.noties.markwon.editor.PersistedSpans;
public class HeadingEditHandler implements EditHandler<HeadingSpan> { public class HeadingEditHandler implements EditHandler<HeadingSpan> {
private MarkwonTheme theme; private MarkwonTheme theme;
@Override @Override
@ -23,12 +22,12 @@ public class HeadingEditHandler implements EditHandler<HeadingSpan> {
@Override @Override
public void configurePersistedSpans(@NonNull PersistedSpans.Builder builder) { public void configurePersistedSpans(@NonNull PersistedSpans.Builder builder) {
builder.persistSpan(Heading1Span.class, new Runnable() { new Heading1Span(theme);}); builder.persistSpan(Heading1Span.class, () -> new Heading1Span(theme));
builder.persistSpan(Heading2Span.class, new Runnable() { new Heading2Span(theme);}); builder.persistSpan(Heading2Span.class, () -> new Heading2Span(theme));
builder.persistSpan(Heading3Span.class, new Runnable() { new Heading3Span(theme);}); builder.persistSpan(Heading3Span.class, () -> new Heading3Span(theme));
builder.persistSpan(Heading4Span.class, new Runnable() { new Heading4Span(theme);}); builder.persistSpan(Heading4Span.class, () -> new Heading4Span(theme));
builder.persistSpan(Heading5Span.class, new Runnable() { new Heading5Span(theme);}); builder.persistSpan(Heading5Span.class, () -> new Heading5Span(theme));
builder.persistSpan(Heading6Span.class, new Runnable() { new Heading6Span(theme);}); builder.persistSpan(Heading6Span.class, () -> new Heading6Span(theme));
} }
@Override @Override
@ -39,7 +38,7 @@ public class HeadingEditHandler implements EditHandler<HeadingSpan> {
@NonNull HeadingSpan span, @NonNull HeadingSpan span,
int spanStart, int spanStart,
int spanTextLength) { int spanTextLength) {
HeadingSpan newSpan; final HeadingSpan newSpan;
switch (span.getLevel()) { switch (span.getLevel()) {
case 1: case 1:
@ -64,8 +63,8 @@ public class HeadingEditHandler implements EditHandler<HeadingSpan> {
return; return;
} }
int newStart = getNewSpanStart(input, spanStart); final int newStart = getNewSpanStart(input, spanStart);
int newEnd = findEnd(input, newStart, newSpan.getLevel()); final int newEnd = findEnd(input, newStart, newSpan.getLevel());
editable.setSpan( editable.setSpan(
newSpan, newSpan,
@ -77,24 +76,24 @@ public class HeadingEditHandler implements EditHandler<HeadingSpan> {
private int findEnd(String input, int searchFrom, int spanLevel) { private int findEnd(String input, int searchFrom, int spanLevel) {
int end = searchFrom + spanLevel; int end = searchFrom + spanLevel;
int strLength = input.length(); final int strLength = input.length();
while (end < strLength-1) { while (end < strLength - 1) {
end++; end++;
if (input.charAt(end) == '\n') { if (input.charAt(end) == '\n') {
break; break;
} }
} }
return end+1; return end + 1;
} }
private int getNewSpanStart(String input, int spanStart) { private int getNewSpanStart(String input, int spanStart) {
int start = spanStart; int start = spanStart;
while (start >= 0 && input.charAt(start) != '\n') { while (start >= 0 && input.charAt(start) != '\n') {
start--; start--;
} }
start += 1; start += 1;
return start; return start;
} }