From 3bc913ac812e2ceee459a4aa1655c9b6697b1e6f Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Wed, 2 Aug 2017 15:25:01 +0200
Subject: [PATCH] Highlight text shown in display asynchronously

---
 .../solovyev/android/calculator/Display.java  |  1 +
 .../android/calculator/DisplayView.java       | 93 +++++++++++++++----
 2 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/solovyev/android/calculator/Display.java b/app/src/main/java/org/solovyev/android/calculator/Display.java
index a58ec550..5c46f708 100644
--- a/app/src/main/java/org/solovyev/android/calculator/Display.java
+++ b/app/src/main/java/org/solovyev/android/calculator/Display.java
@@ -133,6 +133,7 @@ public class Display {
         if (this.view != view) {
             return;
         }
+        this.view.onDestroy();
         this.view = null;
     }
 
diff --git a/app/src/main/java/org/solovyev/android/calculator/DisplayView.java b/app/src/main/java/org/solovyev/android/calculator/DisplayView.java
index df87b0b9..2862953a 100644
--- a/app/src/main/java/org/solovyev/android/calculator/DisplayView.java
+++ b/app/src/main/java/org/solovyev/android/calculator/DisplayView.java
@@ -22,30 +22,74 @@
 
 package org.solovyev.android.calculator;
 
+import static android.util.TypedValue.COMPLEX_UNIT_SP;
+import static android.util.TypedValue.applyDimension;
+
 import android.content.Context;
 import android.content.res.Resources;
+import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.util.AttributeSet;
+
 import org.solovyev.android.Check;
 import org.solovyev.android.calculator.view.TextHighlighter;
 import org.solovyev.android.views.AutoResizeTextView;
 
 import javax.annotation.Nonnull;
 
-import static android.util.TypedValue.COMPLEX_UNIT_SP;
-import static android.util.TypedValue.applyDimension;
-
 public class DisplayView extends AutoResizeTextView {
 
+    private class AsyncHighlighter extends AsyncTask<Void, Void, CharSequence> {
+
+        @NonNull
+        private final String text;
+        @Nullable
+        private final TextHighlighter highlighter;
+
+        AsyncHighlighter(@NonNull String text) {
+            this.text = text;
+            this.highlighter = getTextHighlighter();
+        }
+
+        boolean shouldAsync() {
+            return !TextUtils.isEmpty(text) && highlighter != null;
+        }
+
+        @NonNull
+        @Override
+        protected CharSequence doInBackground(Void... params) {
+            if (highlighter == null) {
+                return text;
+            }
+            try {
+                return highlighter.process(text).getCharSequence();
+            } catch (ParseException e) {
+                return text;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(@NonNull CharSequence text) {
+            if (highlighterTask != this) {
+                return;
+            }
+            setText(text);
+            setTextColor(getTextColor().normal);
+            highlighterTask = null;
+        }
+    }
+
     @Nullable
     private Engine engine;
     @Nullable
     private TextHighlighter textHighlighter;
     @Nonnull
     private DisplayState state = DisplayState.empty();
+    @Nullable
+    private AsyncHighlighter highlighterTask;
 
     public DisplayView(Context context) {
         super(context);
@@ -95,32 +139,41 @@ public class DisplayView extends AutoResizeTextView {
 
         state = newState;
         if (state.valid) {
-            setText(highlightText(state));
-            setTextColor(getTextColor().normal);
+            asyncHighlightText(newState);
         } else {
+            cancelAsyncHighlightText(false);
             setText(App.unspan(getText()));
             setTextColor(getTextColor().error);
         }
     }
 
+    private void cancelAsyncHighlightText(boolean applyLastState) {
+        if (highlighterTask == null) {
+            return;
+        }
+        highlighterTask.cancel(false);
+        if (applyLastState) {
+            highlighterTask.onPostExecute(highlighterTask.text);
+        }
+        highlighterTask = null;
+    }
+
+    private void asyncHighlightText(@NonNull DisplayState state) {
+        cancelAsyncHighlightText(false);
+        highlighterTask = new AsyncHighlighter(state.text);
+        if (highlighterTask.shouldAsync()) {
+            highlighterTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            return;
+        }
+        highlighterTask.onPostExecute(state.text);
+        Check.isNull(highlighterTask);
+    }
+
     public void setEngine(@Nullable Engine engine) {
         this.engine = engine;
     }
 
-    @NonNull
-    private CharSequence highlightText(@Nonnull DisplayState state) {
-        final String text = state.text;
-        if (TextUtils.isEmpty(text)) {
-            return "";
-        }
-        final TextHighlighter textHighlighter = getTextHighlighter();
-        if (textHighlighter == null) {
-            return text;
-        }
-        try {
-            return textHighlighter.process(text).getCharSequence();
-        } catch (ParseException e) {
-            return text;
-        }
+    public void onDestroy() {
+        cancelAsyncHighlightText(true);
     }
 }