Merge pull request #31 from Softwee/feature/bugfixes

New customization, bugfixes & cleanup

Author: kbiakov

.travis.yml

@@ -10,9 +10,10 @@ android:
     - tools # to get the new `repository-11.xml`
     - tools # to install latest Android SDK tools
     - platform-tools
-    - build-tools-25.0.1
+    - build-tools-25.0.3
     - android-25
     - extra-android-m2repository # Design Support library
+    - android-21
     - sys-img-armeabi-v7a-android-21 # system image (emulator)
   licenses:
   - android-sdk-license-.+

codeview/build.gradle

@@ -9,16 +9,16 @@ android {
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 1
-        versionName '1.0'
+        versionName '1.3.0'
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    lintOptions {
+        abortOnError false
     }
 }
 
@@ -28,8 +28,3 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support:recyclerview-v7:25.3.1'
 }
-repositories {
-    mavenCentral()
-}
-buildscript {
-}

codeview/src/main/assets/fonts/Consolas.ttf

@@ -1,6 +1,8 @@
 package io.github.kbiakov.codeview
 
 import android.content.Context
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.util.AttributeSet
@@ -10,6 +12,8 @@ import io.github.kbiakov.codeview.Thread.delayed
 import io.github.kbiakov.codeview.adapters.AbstractCodeAdapter
 import io.github.kbiakov.codeview.adapters.CodeWithNotesAdapter
 import io.github.kbiakov.codeview.adapters.Options
+import io.github.kbiakov.codeview.highlight.ColorThemeData
+import io.github.kbiakov.codeview.highlight.color
 
 /**
  * @class CodeView
@@ -20,52 +24,58 @@ import io.github.kbiakov.codeview.adapters.Options
  */
 class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context, attrs) {
 
-    private val vShadowRight: View
-    private val vShadowBottomLine: View
-    private val vShadowBottomContent: View
-
     private val vCodeList: RecyclerView
+    private val vShadows: Map<ShadowPosition, View>
 
     /**
      * Primary constructor.
      */
     init {
         inflate(context, R.layout.layout_code_view, this)
+        checkStartAnimation(attrs)
+
+        vCodeList = findViewById(R.id.rv_code_content) as RecyclerView
+        vCodeList.layoutManager = LinearLayoutManager(context)
+        vCodeList.isNestedScrollingEnabled = true
+
+        vShadows = mapOf(
+                ShadowPosition.RightBorder to R.id.shadow_right_border,
+                ShadowPosition.NumBottom to R.id.shadow_num_bottom,
+                ShadowPosition.ContentBottom to R.id.shadow_content_bottom
+        ).mapValues { findViewById(it.value) }
+    }
 
-        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
-        }
-
-        // TODO: add shadow color customization
-        vShadowRight = findViewById(R.id.v_shadow_right)
-        vShadowBottomLine = findViewById(R.id.v_shadow_bottom_line)
-        vShadowBottomContent = findViewById(R.id.v_shadow_bottom_content)
+    }
 
-        vCodeList = findViewById(R.id.rv_code_content) as RecyclerView
-        vCodeList.layoutManager = LinearLayoutManager(context)
-        vCodeList.isNestedScrollingEnabled = true
+    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(1f)
-                getAdapter()?.notifyDataSetChanged()
+        getAdapter()?.apply {
+            highlight {
+                checkHighlightAnimation(this::notifyDataSetChanged)
             }
         }
     }
@@ -74,14 +84,15 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
      * Border shadows will shown if full listing presented.
      * It helps to see what part of code is scrolled & hidden.
      *
-     * @param isShadows Is shadows needed
+     * @param isVisible Is shadows visible
      */
-    private fun setupShadows(isShadows: Boolean) {
-        val visibility = if (isShadows) VISIBLE else GONE
-
-        vShadowRight.visibility = visibility
-        vShadowBottomLine.visibility = visibility
-        vShadowBottomContent.visibility = visibility
+    fun setupShadows(isVisible: Boolean) {
+        val visibility = if (isVisible) VISIBLE else GONE
+        val theme = getOptionsOrDefault().theme
+        vShadows.forEach { (pos, view) ->
+            view.visibility = visibility
+            view.setSafeBackground(pos.createShadow(theme))
+        }
     }
 
     // - Initialization
@@ -105,7 +116,6 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
      */
     fun setAdapter(adapter: AbstractCodeAdapter<*>) {
         vCodeList.adapter = adapter
-        setupShadows(adapter.options.shadows)
         highlight()
     }
 
@@ -125,6 +135,12 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
     fun updateOptions(options: Options) {
         getAdapter() ?: setOptions(options)
         getAdapter()?.options = options
+        setupShadows(options.shadows)
+    }
+
+    fun updateOptions(body: Options.() -> Unit) {
+        val options = getOptions() ?: getOptionsOrDefault()
+        updateOptions(options.apply(body))
     }
 
     // - Adapter
@@ -181,14 +197,35 @@ 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
             }
             return false
         }
+
+        private fun View.setSafeBackground(newBackground: Drawable) {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+                background = newBackground
+            }
+        }
+    }
+
+    private enum class ShadowPosition {
+        RightBorder,
+        NumBottom,
+        ContentBottom;
+
+        fun createShadow(theme: ColorThemeData) = when (this) {
+            RightBorder -> GradientDrawable.Orientation.LEFT_RIGHT to theme.bgContent
+            NumBottom -> GradientDrawable.Orientation.TOP_BOTTOM to theme.bgNum
+            ContentBottom -> GradientDrawable.Orientation.TOP_BOTTOM to theme.bgContent
+        }.let {
+            val colors = arrayOf(android.R.color.transparent, it.second)
+            GradientDrawable(it.first, colors.map(Int::color).toIntArray())
+        }
     }
 }
 

codeview/src/main/assets/fonts/CourierNew.ttf

@@ -4,20 +4,23 @@ import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.text.Html
+import android.text.SpannableString
 import android.text.Spanned
+import android.text.TextUtils
 import android.util.TypedValue
 import java.io.BufferedReader
 import java.io.InputStreamReader
-import java.util.*
 import java.util.concurrent.Executors
 
 object Const {
     val DefaultDelay = 250L
 
     object Alpha {
+        val Visible = 1f
         val Initial = 0.7f
+
+        val AlmostInvisible = 0.1f
         val Invisible = 0f
-        val Visible = 1f
     }
 }
 
@@ -54,7 +57,7 @@ fun extractLines(source: String) = listOf(*source.split("\n").toTypedArray())
  * @param idx Index to slice
  * @return Pair of lists with head and tail
  */
-fun <T> List<T>.slice(idx: Int) = Pair(this.subList(0, idx), this.subList(idx, this.lastIndex))
+fun <T> List<T>.slice(idx: Int) = Pair(subList(0, idx), subList(idx, lastIndex))
 
 /**
  * Get HTML from string.
@@ -63,13 +66,21 @@ fun <T> List<T>.slice(idx: Int) = Pair(this.subList(0, idx), this.subList(idx, t
  * @return Spanned HTML string
  */
 @Suppress("deprecation")
-fun html(content: String) =
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N)
-            Html.fromHtml(content.htmlSafe(), Html.FROM_HTML_MODE_LEGACY)
-        else
-            Html.fromHtml(content.htmlSafe())
+fun html(content: String): Spanned {
+    val spanned = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N)
+        Html.fromHtml(content, Html.FROM_HTML_MODE_LEGACY)
+    else
+        Html.fromHtml(content)
+    val spaces = content.startSpacesForTaggedString()
+    return SpannableString(TextUtils.concat(spaces, spanned))
+}
 
-fun String.htmlSafe() = replace(" ", "&nbsp;")
+private fun String.startSpacesForTaggedString(): String {
+    val startIdx = indexOf('>') + 1
+    val escaped = substring(startIdx)
+    val count = escaped.indexOf(escaped.trim())
+    return " ".repeat(count)
+}
 
 object Thread {
     /**