From ca5c38e71ced4a01e592477c1d63e89d00ef1b37 Mon Sep 17 00:00:00 2001
From: houxg <houxg09@foxmail.com>
Date: Mon, 5 Dec 2016 14:52:04 +0800
Subject: [PATCH] toggle icon when state of header changed; set content in
 silent

---
 .../java/org/houxg/leamonax/editor/Editor.java    |   3 ++-
 .../leamonax/editor/QuillCallbackHandler.java     |   3 +++
 .../org/houxg/leamonax/editor/RichTextEditor.java |   2 +-
 .../houxg/leamonax/ui/edit/EditorFragment.java    |  10 ++++++++++
 .../ic_header_richtext_disable.png                | Bin 0 -> 268 bytes
 .../drawable-xxhdpi/ic_header_richtext_enable.png | Bin 0 -> 270 bytes
 app/src/main/res/layout/format_bar_richtext.xml   |   4 ++--
 7 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_header_richtext_disable.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_header_richtext_enable.png

diff --git a/app/src/main/java/org/houxg/leamonax/editor/Editor.java b/app/src/main/java/org/houxg/leamonax/editor/Editor.java
index 6aa5abc..386cc92 100644
--- a/app/src/main/java/org/houxg/leamonax/editor/Editor.java
+++ b/app/src/main/java/org/houxg/leamonax/editor/Editor.java
@@ -21,7 +21,8 @@ public abstract class Editor {
         ITALIC,
         ORDER_LIST,
         UNORDER_LIST,
-        BLOCK_QUOTE;
+        HEADER,
+        BLOCK_QUOTE
     }
 
     protected EditorListener mListener;
diff --git a/app/src/main/java/org/houxg/leamonax/editor/QuillCallbackHandler.java b/app/src/main/java/org/houxg/leamonax/editor/QuillCallbackHandler.java
index 5287487..523cbec 100644
--- a/app/src/main/java/org/houxg/leamonax/editor/QuillCallbackHandler.java
+++ b/app/src/main/java/org/houxg/leamonax/editor/QuillCallbackHandler.java
@@ -78,6 +78,9 @@ public class QuillCallbackHandler {
                 case "blockquote":
                     formatStatusMap.put(Editor.Style.BLOCK_QUOTE, getBoolean((Boolean) format.getValue()));
                     break;
+                case "header":
+                    Double headerLevel = ((Double)format.getValue());
+                    formatStatusMap.put(Editor.Style.HEADER, headerLevel != null && headerLevel > 0);
             }
         }
         return formatStatusMap;
diff --git a/app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java b/app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java
index 0643c2e..52f1f3f 100644
--- a/app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java
+++ b/app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java
@@ -69,7 +69,7 @@ public class RichTextEditor extends Editor implements OnJsEditorStateChangedList
 
     @Override
     public void setContent(String content) {
-        execJs(String.format(Locale.US, "quill.pasteHTML('%s');", HtmlUtils.escapeHtml(content)));
+        execJs(String.format(Locale.US, "quill.pasteHTML('%s', 'silent');", HtmlUtils.escapeHtml(content)));
     }
 
     @Override
diff --git a/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java b/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java
index fb777e8..ab1a17b 100644
--- a/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java
+++ b/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java
@@ -331,6 +331,11 @@ public class EditorFragment extends Fragment implements Editor.EditorListener {
                         case BLOCK_QUOTE:
                             mQuoteBtn.setChecked(enabled);
                             break;
+                        case HEADER:
+                            if (mHeadingBtn != null) {
+                                mHeadingBtn.setChecked(enabled);
+                            }
+                            break;
                     }
                 }
             }
@@ -357,6 +362,11 @@ public class EditorFragment extends Fragment implements Editor.EditorListener {
                         case UNORDER_LIST:
                             mUnorderListBtn.setChecked(enabled);
                             break;
+                        case HEADER:
+                            if (mHeadingBtn != null) {
+                                mHeadingBtn.setChecked(enabled);
+                            }
+                            break;
                     }
                 }
             }
diff --git a/app/src/main/res/drawable-xxhdpi/ic_header_richtext_disable.png b/app/src/main/res/drawable-xxhdpi/ic_header_richtext_disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f39837ed88aa5b3925885a9ffb6ce6df6879cd9
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yR!3HGr>b-n`6k~CayA#8@b22Z1oMWCYjv*18
z$uV0pF0!(*vBfDIW7T>5=uzCmNk`QAOse$)?lDfE_5c5W@r?|sq76KCF<m!q+;GS`
z!7Ajid1^ssT2j)Z#6zl{`X2+?d)f|UaDWM(3J!ra8UOzNKE5~Ws+L^QtG4&|_Y0fM
zU(jS<|L+b{QqdcAuk#J=2Ujq=IX5KeC8VU>VaT~&tFGmlthI@q%QKNn*@eTZVd_*<
zYa^pil1|(obrM!rXkYkPA!{&;&CNN%gaw&kV5lt6eY5}T_cox97(8A5T-G@yGywpn
CYGNJ$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_header_richtext_enable.png b/app/src/main/res/drawable-xxhdpi/ic_header_richtext_enable.png
new file mode 100644
index 0000000000000000000000000000000000000000..22b519294c4debbe9ce9fcebcd15c35c15f91020
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yR!3HGr>b-n`6k~CayA#8@b22Z1oD-fdjv*18
z$t6WayAGT<apH6Xvw^X3^t)SIUyJf(?m2Ys+_~aLE|~&Nrd!cRm{dgm{r`Wy-&-)C
zk9E3?V&Q@~&IMAcHm@pXeDJvBnstS7v7&(#6PRF@V>%LIa%bVfg*Hz@c=GS>Q_Zk*
zWUc@IZ!fD!hs^KJOU4fZ4PG@|6i}GK-H>~X_rSKh<%=en%u-qqSG^!k(<D(u&yn50
z&@lD=y}iFByY!SS4~TsaTM)E|Pr{cOVGWeU!0>CgMh*Apw&g%SF?hQAxvX<aXaWGt
CD`Kbs

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/format_bar_richtext.xml b/app/src/main/res/layout/format_bar_richtext.xml
index acb9c45..4605116 100755
--- a/app/src/main/res/layout/format_bar_richtext.xml
+++ b/app/src/main/res/layout/format_bar_richtext.xml
@@ -42,8 +42,8 @@
         <org.houxg.leamonax.widget.ToggleImageButton
             android:id="@+id/btn_heading"
             style="@style/FormatButton"
-            app:checkedDrawable="@drawable/ic_heading_enable"
-            app:uncheckedDrawable="@drawable/ic_heading_disable" />
+            app:checkedDrawable="@drawable/ic_header_richtext_enable"
+            app:uncheckedDrawable="@drawable/ic_header_richtext_disable" />
 
         <org.houxg.leamonax.widget.ToggleImageButton
             android:id="@+id/btn_unorder_list"