Flag to control highlighting animation

Author: kbiakov

codeview/src/main/java/io/github/kbiakov/codeview/CodeView.kt

@@ -28,7 +28,7 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
      */
     init {
         inflate(context, R.layout.layout_code_view, this)
-        checkInitialAnimation(attrs)
+        checkStartAnimation(attrs)
 
         // TODO: add shadow color customization
         vShadows = listOf(
@@ -42,30 +42,37 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
         vCodeList.isNestedScrollingEnabled = true
     }
 
-    private fun checkInitialAnimation(attrs: AttributeSet) {
-        if (visibility == VISIBLE && isAnimateOnStart(context, attrs)) {
+    private fun checkStartAnimation(attrs: AttributeSet) {
+        if (visibility == VISIBLE && attrs.isAnimateOnStart(context)) {
             alpha = Const.Alpha.Invisible
 
             animate()
                     .setDuration(Const.DefaultDelay * 5)
                     .alpha(Const.Alpha.Initial)
-        } else {
+        } else
             alpha = Const.Alpha.Initial
-        }
+    }
+
+    private fun AbstractCodeAdapter<*>.checkHighlightAnimation(action: () -> Unit) {
+        if (options.animateOnHighlight) {
+            animate()
+                    .setDuration(Const.DefaultDelay * 2)
+                    .alpha(Const.Alpha.AlmostInvisible)
+            delayed {
+                animate().alpha(Const.Alpha.Visible)
+                action()
+            }
+        } else action()
     }
 
     /**
      * Highlight code with defined programming language.
      * It holds the placeholder on view until code is not highlighted.
      */
     private fun highlight() {
-        getAdapter()?.highlight {
-            animate()
-                    .setDuration(Const.DefaultDelay * 2)
-                    .alpha(.1f)
-            delayed {
-                animate().alpha(Const.Alpha.Visible)
-                getAdapter()?.notifyDataSetChanged()
+        getAdapter()?.apply {
+            highlight {
+                checkHighlightAnimation(this::notifyDataSetChanged)
             }
         }
     }
@@ -124,6 +131,12 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
         getAdapter()?.options = options
     }
 
+    fun updateOptions(): Options {
+        val options = getOptions() ?: getOptionsOrDefault()
+        updateOptions(options)
+        return options
+    }
+
     // - Adapter
 
     /**
@@ -178,8 +191,8 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
 
     companion object {
 
-        private fun isAnimateOnStart(context: Context, attr: AttributeSet): Boolean {
-            context.theme.obtainStyledAttributes(attr, R.styleable.CodeView, 0, 0).apply {
+        private fun AttributeSet.isAnimateOnStart(context: Context): Boolean {
+            context.theme.obtainStyledAttributes(this, R.styleable.CodeView, 0, 0).apply {
                 val flag = getBoolean(R.styleable.CodeView_animateOnStart, false)
                 recycle()
                 return@isAnimateOnStart flag

codeview/src/main/java/io/github/kbiakov/codeview/Utils.kt

@@ -16,9 +16,11 @@ object Const {
     val DefaultDelay = 250L
 
     object Alpha {
+        val Visible = 1f
         val Initial = 0.7f
+
+        val AlmostInvisible = 0.1f
         val Invisible = 0f
-        val Visible = 1f
     }
 }
 

codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt

@@ -191,16 +191,11 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
     override fun onBindViewHolder(holder: ViewHolder, pos: Int) {
         if (holder is LineViewHolder) {
             val num = pos - LineStartIdx
-            val line = lines[num]
-            holder.mItem = line
+            holder.mItem = lines[num]
 
-            options.lineClickListener?.let {
-                holder.itemView.setOnClickListener {
-                    options.lineClickListener?.onCodeLineClicked(num, line)
-                }
-            }
-            setupLine(num, line, holder)
-            displayLineFooter(num, holder)
+            bindClickListener(num, holder)
+            setupContent(num, holder)
+            displayFooter(num, holder)
         }
     }
 
@@ -210,24 +205,36 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
 
     // - Helpers (for view holder)
 
+    private fun bindClickListener(pos: Int, holder: ViewHolder) {
+        options.lineClickListener?.let {
+            holder.itemView.setOnClickListener {
+                options.lineClickListener?.onCodeLineClicked(pos, lines[pos])
+            }
+        }
+    }
+
     @SuppressLint("SetTextI18n")
-    private fun setupLine(pos: Int, line: String, holder: ViewHolder) {
-        val fontSize = options.format.fontSize
-
-        holder.tvLineContent.textSize = fontSize
-        holder.tvLineContent.text = html(line)
-        holder.tvLineContent.setTextColor(options.theme.noteColor.color())
-
-        if (options.shortcut && pos == MaxShortcutLines) {
-            holder.tvLineNum.textSize = fontSize * Format.ShortcutScale
-            holder.tvLineNum.text = context.getString(R.string.dots)
-        } else {
-            holder.tvLineNum.textSize = fontSize
-            holder.tvLineNum.text = "${pos + 1}"
+    private fun setupContent(pos: Int, holder: ViewHolder) {
+        holder.apply {
+            val fontSize = options.format.fontSize
+            tvLineNum.apply {
+                if (!options.shortcut || pos < MaxShortcutLines) {
+                    text = "${pos + 1}"
+                    textSize = fontSize
+                } else {
+                    text = context.getString(R.string.dots)
+                    textSize = fontSize * Format.ShortcutScale
+                }
+            }
+            tvLineContent.apply {
+                text = html(lines[pos])
+                textSize = fontSize
+                setTextColor(options.theme.noteColor.color())
+            }
         }
     }
 
-    private fun displayLineFooter(pos: Int, holder: ViewHolder) {
+    private fun displayFooter(pos: Int, holder: ViewHolder) {
         val entityList = footerEntities[pos]
 
         holder.llLineFooter.removeAllViews()
@@ -301,6 +308,9 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
  * @param code Code content
  * @param language Programming language to highlight
  * @param theme Color theme
+ * @param font Font typeface
+ * @param format How much space is content took?
+ * @param animateOnHighlight Is animate on highlight?
  * @param shadows Is border shadows needed?
  * @param maxLines Max lines to show (when limit is reached, rest is dropped)
  * @param shortcut Do you want to show shortcut of code listing?
@@ -316,6 +326,7 @@ data class Options(
         var theme: ColorThemeData = ColorTheme.DEFAULT.theme(),
         var font: Typeface = FontCache.get(context).getTypeface(context),
         var format: Format = Format.Compact,
+        var animateOnHighlight: Boolean = true,
         var shadows: Boolean = false,
         var shortcut: Boolean = false,
         var shortcutNote: String = context.getString(R.string.show_all),
@@ -373,6 +384,21 @@ data class Options(
         withFont(font)
     }
 
+    fun withFormat(format: Format): Options {
+        this.format = format
+        return this
+    }
+
+    fun animateOnHighlight(): Options {
+        this.animateOnHighlight = true
+        return this
+    }
+
+    fun disableHighlightAnimation(): Options {
+        this.animateOnHighlight = false
+        return this
+    }
+
     fun withShadows(): Options {
         this.shadows = true
         return this