Fix bugs, update performance.

Author: e16din

.gitignore

@@ -1,8 +1,9 @@
+### Android ###
 # Built application files
 *.apk
 *.ap_
 
-# Files for the ART/Dalvik VM
+# Files for the Dalvik VM
 *.dex
 
 # Java class files
@@ -11,11 +12,17 @@
 # Generated files
 bin/
 gen/
-out/
 
 # Gradle files
 .gradle/
 build/
+/*/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -26,15 +33,57 @@ proguard/
 # Log Files
 *.log
 
-# Android Studio Navigation editor temp files
-.navigation/
+### Android Patch ###
+gen-external-apklibs
 
-# Android Studio captures folder
-captures/
 
-# Intellij
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+
 *.iml
+
+## Directory-based project format:
 .idea/
+# if you remove the above rule, at least ignore the following:
+
+# User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+
+# Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
+
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
+
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
 
-# Keystore files
-*.jks
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+*.iml
+
+*.iml

codeview/build.gradle

@@ -23,9 +23,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     compile 'com.android.support:appcompat-v7:24.2.0'

codeview/src/androidTest/java/io/github/kbiakov/codeview/ApplicationTest.java

@@ -41,6 +41,15 @@ class CodeView : RelativeLayout {
     private val vShadowBottomLine: View
     private val vShadowBottomContent: View
 
+    internal var colorTheme: ColorThemeData
+        set(colorTheme) {
+            field = colorTheme
+        }
+
+    init {
+        colorTheme = ColorTheme.SOLARIZED_LIGHT.with()
+    }
+
     /**
      * Core view to draw code by lines.
      */
@@ -57,8 +66,9 @@ class CodeView : RelativeLayout {
      */
     private var state: ViewState
         set(newState) {
-            if (newState == ViewState.PRESENTED)
+            if (newState == ViewState.PRESENTED) {
                 hidePlaceholder()
+            }
             field = newState
         }
 
@@ -86,6 +96,8 @@ class CodeView : RelativeLayout {
     /**
      * Code view state to control build flow.
      */
+    //todo: remove states and tasks
+    //todo: or sort task positions (first we need to set adapter, then other actions and call highlight task on finish)
     enum class ViewState {
         BUILD,
         PREPARE,
@@ -100,19 +112,20 @@ class CodeView : RelativeLayout {
      * @return Result of state check
      */
     fun isBuilding() = state == ViewState.BUILD
+
     fun isPrepared() = state == ViewState.PREPARE
     fun isPresented() = state == ViewState.PRESENTED
 
     /**
      * Accessor/mutator to reduce frequently used actions.
      */
-    var adapter: AbstractCodeAdapter<*>
+    var adapter: AbstractCodeAdapter<*>?
         get() {
             return rvCodeContent.adapter as AbstractCodeAdapter<*>
         }
         set(adapter) {
+            rvCodeContent.adapter = adapter
             delayed { // prevent UI overhead & initialization inconsistency
-                rvCodeContent.adapter = adapter
                 state = ViewState.PRESENTED
             }
         }
@@ -157,13 +170,15 @@ class CodeView : RelativeLayout {
      */
 
     // default color theme provided by enum
-    fun setColorTheme(colorTheme: ColorTheme) = addTask {
-        adapter.colorTheme = colorTheme.with()
+    fun colorTheme(colorTheme: ColorTheme): CodeView {
+        this.colorTheme = colorTheme.with()
+        return this
     }
 
     // custom color theme provided by user
-    fun setColorTheme(colorTheme: ColorThemeData) = addTask {
-        adapter.colorTheme = colorTheme
+    fun colorTheme(colorTheme: ColorThemeData): CodeView {
+        this.colorTheme = colorTheme
+        return this
     }
 
     /**
@@ -172,19 +187,19 @@ class CodeView : RelativeLayout {
      *
      * @param language Language to highlight
      */
-    fun highlightCode(language: String) = addTask {
-        adapter.highlightCode(language) {
-            refreshAnimated()
+    fun highlight(language: String? = null) {
+        if (adapter == null) {
+            throw IllegalStateException("Please set adapter or use codeContent() before highlight()")
         }
-    }
 
-    /**
-     * Highlight code with trying to classify by code snippet.
-     * It shows not highlighted code & then when classified refreshes view.
-     */
-    fun highlightCode() = addTask {
-        adapter.highlightCode {
-            refreshAnimated()
+        adapter?.highlight(language) {
+            animate().setDuration(Utils.DELAY * 2)// * 2 to wait notifyDataSetChanged
+                    .alpha(.1f)
+
+            delayed {
+                animate().alpha(1f)
+                adapter?.notifyDataSetChanged()
+            }
         }
     }
 
@@ -194,15 +209,24 @@ class CodeView : RelativeLayout {
      *
      * @param listener Code line click listener
      */
-    fun setCodeListener(listener: OnCodeLineClickListener) = addTask {
-        adapter.codeListener = listener
+    fun codeListener(listener: OnCodeLineClickListener): CodeView {
+        if (adapter == null) {
+            throw IllegalStateException("Please set adapter or use codeContent() before highlight()")
+        }
+
+        adapter?.codeListener = listener
+        return this
     }
 
     /**
      * Remove code listener.
      */
     fun removeCodeListener() = addTask {
-        adapter.codeListener = null
+        if (adapter == null) {
+            throw IllegalStateException("Please set adapter or use codeContent() before highlight()")
+        }
+
+        adapter?.codeListener = null
     }
 
     /**
@@ -222,7 +246,7 @@ class CodeView : RelativeLayout {
      *
      * @param content Code content
      */
-    fun setCodeContent(content: String) {
+    fun codeContent(content: String): CodeView {
         when (state) {
             ViewState.BUILD ->
                 build(content)
@@ -233,6 +257,8 @@ class CodeView : RelativeLayout {
             ViewState.PRESENTED ->
                 update(content)
         }
+
+        return this
     }
 
     /**
@@ -249,8 +275,9 @@ class CodeView : RelativeLayout {
         measurePlaceholder(linesCount)
         state = ViewState.PREPARE
 
+        rvCodeContent.adapter = CodeWithNotesAdapter(context, content, colorTheme)
+
         delayed {
-            rvCodeContent.adapter = CodeWithNotesAdapter(context, content)
             processBuildTasks()
             setupShadows()
             hidePlaceholder()
@@ -266,7 +293,7 @@ class CodeView : RelativeLayout {
     private fun update(content: String) {
         state = ViewState.PREPARE
         measurePlaceholder(extractLines(content).size)
-        adapter.updateCodeContent(content)
+        adapter?.updateCodeContent(content)
         hidePlaceholder()
         state = ViewState.PRESENTED
     }
@@ -277,7 +304,7 @@ class CodeView : RelativeLayout {
      * Border shadows will shown if presented full code listing.
      * It helps user to see what part of content are scrolled & hidden.
      */
-    private fun setupShadows() = setShadowsVisible(!adapter.isFullShowing)
+    private fun setupShadows() = setShadowsVisible(!adapter?.isFullShowing!!)
 
     /**
      * Placeholder fills space at start and stretched to marked up view size
@@ -287,15 +314,11 @@ class CodeView : RelativeLayout {
      */
     private fun measurePlaceholder(linesCount: Int) {
         val lineHeight = dpToPx(context, 24)
-        val topPadding = dpToPx(context, 8)
-
-        // double padding (top & bottom), one is enough for single line view
-        val padding = (if (linesCount > 1) 2 else 1) * topPadding
+        val verticalPadding = dpToPx(context, 8)
 
-        val height = linesCount * lineHeight + padding
+        val height = linesCount * lineHeight + verticalPadding
 
-        vPlaceholder.layoutParams = LayoutParams(
-                LayoutParams.MATCH_PARENT, height)
+        vPlaceholder.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, height)
 
         vPlaceholder.alpha = 1f
     }
@@ -306,14 +329,6 @@ class CodeView : RelativeLayout {
             .setDuration(350)
             .alpha(0f)
             .didAnimated { vPlaceholder.alpha = 0f }
-
-    private fun refreshAnimated() = animate()
-            .setDuration(150)
-            .alpha(.2f)
-            .didAnimated {
-                adapter.notifyDataSetChanged()
-                animate().alpha(1f)
-            }
 }
 
 /**

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

@@ -10,6 +10,12 @@ import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.util.concurrent.Executors
 
+class Utils {
+    companion object {
+        val DELAY: Long = 250
+    }
+}
+
 /**
  * Get px by dip value.
  *
@@ -75,7 +81,7 @@ object Thread {
      * @param body Operation body
      * @param delayMs Delay in m
      */
-    fun delayed(delayMs: Long = 150, body: () -> Unit) = Handler().postDelayed(body, delayMs)
+    fun delayed(delayMs: Long = Utils.DELAY, body: () -> Unit) = Handler().postDelayed(body, delayMs)
 
     // - Extensions for block manipulations