leanote/leanote-android
1
0
Fork 0
mirror of https://github.com/leanote/leanote-android.git synced 2025-10-16 15:28:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/note_item_with_parsed_html' into develop

Browse Source
This commit is contained in:
houxg
2016-12-12 11:21:46 +08:00
parent a2a375d25b 79e20c86c2
commit 042dc56b91
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java
View File

@@ -3,6 +3,7 @@ package org.houxg.leamonax.adapter;
import android.content.Context; import android.content.Context;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.text.Html;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
@@ -76,7 +77,15 @@ public class NoteAdapter extends RecyclerView.Adapter<NoteAdapter.NoteHolder> {
} else { } else {
holder.titleTv.setText(getHighlightedText(note.getTitle())); holder.titleTv.setText(getHighlightedText(note.getTitle()));
} }
holder.contentTv.setText(note.getContent()); if (note.isMarkDown()) {
holder.contentTv.setText(note.getContent());
} else {
Spanned spannedContent = Html.fromHtml(note.getContent());
String contentStr = spannedContent.toString();
contentStr = contentStr.replaceAll("\\n\\n+", "\n");
holder.contentTv.setText(contentStr);
}
holder.notebookTv.setText(mNotebookId2TitleMaps.get(note.getNoteBookId())); holder.notebookTv.setText(mNotebookId2TitleMaps.get(note.getNoteBookId()));
long updateTime = note.getUpdatedTimeVal(); long updateTime = note.getUpdatedTimeVal();
Context context = holder.updateTimeTv.getContext(); Context context = holder.updateTimeTv.getContext();