#2 Render markdown inline

- better font-sizes for h1-h6 - enable RxMarkdown on creating notes (not only editing)
nextcloud · Dec 11, 2016 · 0fc2053 · 0fc2053
1 parent 9a97fc9
commit 0fc2053
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/CreateNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/CreateNoteActivity.java
@@ -5,19 +5,25 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.EditText;
+import android.widget.TextView;
+
+import com.yydcdut.rxmarkdown.RxMDEditText;
+import com.yydcdut.rxmarkdown.RxMarkdown;
+import com.yydcdut.rxmarkdown.factory.EditFactory;
 
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
+import it.niedermann.owncloud.notes.util.MarkDownUtil;
+import rx.Subscriber;
 
 public class CreateNoteActivity extends AppCompatActivity {
-    private EditText editTextField = null;
+    private RxMDEditText editTextField = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_create);
-        editTextField = (EditText) findViewById(R.id.createContent);
+        editTextField = (RxMDEditText) findViewById(R.id.createContent);
 
         // Get intent, action and MIME type
         Intent intent = getIntent();
@@ -29,6 +35,25 @@ protected void onCreate(Bundle savedInstanceState) {
                 editTextField.setText(intent.getStringExtra(Intent.EXTRA_TEXT));
             }
         }
+
+        RxMarkdown.live(editTextField)
+                .config(MarkDownUtil.getMarkDownConfiguration(getApplicationContext()))
+                .factory(EditFactory.create())
+                .intoObservable()
+                .subscribe(new Subscriber<CharSequence>() {
+                    @Override
+                    public void onCompleted() {
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                    }
+
+                    @Override
+                    public void onNext(CharSequence charSequence) {
+                        editTextField.setText(charSequence, TextView.BufferType.SPANNABLE);
+                    }
+                });
     }
 
     @Override

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java
@@ -21,6 +21,11 @@ public class MarkDownUtil {
      */
     public static RxMDConfiguration getMarkDownConfiguration(Context context) {
         return new RxMDConfiguration.Builder(context)
+                .setHeader2RelativeSize(1.35f)
+                .setHeader3RelativeSize(1.25f)
+                .setHeader4RelativeSize(1.15f)
+                .setHeader5RelativeSize(1.1f)
+                .setHeader6RelativeSize(1.05f)
                 .setLinkColor(ResourcesCompat.getColor(context.getResources(), R.color.primary, null))
                 .build();
     }

diff --git a/app/src/main/res/layout/activity_create.xml b/app/src/main/res/layout/activity_create.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <EditText
+        <com.yydcdut.rxmarkdown.RxMDEditText
             android:id="@+id/createContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"