Merge branch 'develop' into feature/tinnyMCE

README.md

@@ -1,9 +1,35 @@
 # Leamonax
-![Logo](https://raw.githubusercontent.com/houxg/Leamonax/develop/screenshot/logo.png)
+<img src='https://travis-ci.org/houxg/Leamonax.svg?branch=master'/>
 
-This is a third party Android client for Leanote. Some of code(js editor) comes from [leanote-android](https://github.com/leanote/leanote-android).
+This is a third party Android client for Leanote.
 
 **It's still in developing.** Be careful when you using it and make sure you have an backup.
 
----
+# Screenshot
 ![MainActivity](https://raw.githubusercontent.com/houxg/Leamonax/develop/screenshot/MainActivity.png)
+![Navigation](https://raw.githubusercontent.com/houxg/Leamonax/develop/screenshot/Navigation.png)
+![RichText](https://raw.githubusercontent.com/houxg/Leamonax/develop/screenshot/RichText.png)
+![Markdown](https://raw.githubusercontent.com/houxg/Leamonax/develop/screenshot/Markdown.png)
+
+# Install
+[Git Release](https://github.com/houxg/Leamonax/releases/latest)
+
+# Features
+- [x] Sign in/up
+- [x] Sync and view your notes/notebooks
+- [x] RichText support
+- [x] Markdown support
+- [x] Custom host
+- [x] Search by note's title
+
+# TODO
+- [ ] Chinese language support
+- [ ] Quick note
+- [ ] Integration of tinnyMCE
+- [ ] Searching for full-text fields
+- [ ] Import html file
+
+# Thanks
+## Contributors
+[xingstarx](https://github.com/xingstarx)
+##

app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java

@@ -3,6 +3,7 @@ package org.houxg.leamonax.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
+import android.text.Html;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -76,7 +77,15 @@ public class NoteAdapter extends RecyclerView.Adapter<NoteAdapter.NoteHolder> {
         } else {
             holder.titleTv.setText(getHighlightedText(note.getTitle()));
         }
+        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()));
         long updateTime = note.getUpdatedTimeVal();
         Context context = holder.updateTimeTv.getContext();