fix onCodeLineClicked line number;

changed vPlaceholder.visibility to vPlaceholder.alpha to fix animation
blinking when android:animateLayoutChanges is true and we has several
CodeView in the Layout;

Author: e16din

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

@@ -6,11 +6,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import io.github.kbiakov.codeview.classifier.CodeProcessor
-import io.github.kbiakov.codeview.highlight.*
 import io.github.kbiakov.codeview.Thread.async
 import io.github.kbiakov.codeview.Thread.ui
 import io.github.kbiakov.codeview.classifier.CodeClassifier
+import io.github.kbiakov.codeview.classifier.CodeProcessor
+import io.github.kbiakov.codeview.highlight.*
 import java.util.*
 
 /**
@@ -178,7 +178,7 @@ class CodeContentAdapter : RecyclerView.Adapter<CodeContentAdapter.ViewHolder> {
         holder.mItem = codeLine
 
         holder.itemView.setOnClickListener {
-            codeListener?.onCodeLineClicked(position)
+            codeListener?.onCodeLineClicked(position + 1)
         }
 
         holder.tvLineContent.text = html(codeLine)

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

@@ -13,7 +13,6 @@ import android.view.ViewPropertyAnimator
 import android.widget.RelativeLayout
 import io.github.kbiakov.codeview.highlight.ColorTheme
 import io.github.kbiakov.codeview.highlight.ColorThemeData
-import io.github.kbiakov.codeview.highlight.color
 import java.util.*
 
 /**
@@ -186,7 +185,7 @@ class CodeView : RelativeLayout {
      * @param isVisible Shadows visibility
      */
     fun setShadowsVisible(isVisible: Boolean = true) = addTask {
-        val visibility = if (isVisible) View.VISIBLE else GONE
+        val visibility = if (isVisible) VISIBLE else GONE
         vShadowRight.visibility = visibility
         vShadowBottomLine.visibility = visibility
         vShadowBottomContent.visibility = visibility
@@ -271,17 +270,16 @@ class CodeView : RelativeLayout {
 
         vPlaceholder.layoutParams = RelativeLayout.LayoutParams(
                 RelativeLayout.LayoutParams.MATCH_PARENT, height)
-        vPlaceholder.visibility = View.VISIBLE
+
+        vPlaceholder.alpha = 1f
     }
 
     // - Animations
 
     private fun hidePlaceholder() = vPlaceholder.animate()
             .setDuration(350)
             .alpha(0f)
-            .didAnimated {
-                vPlaceholder.visibility = View.GONE
-            }
+            .didAnimated { vPlaceholder.alpha = 0f }
 
     private fun refreshAnimated() = animate()
             .setDuration(150)

example/src/main/java/io/github/kbiakov/codeviewexample/ListingsActivity.java

@@ -2,11 +2,11 @@
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
 import io.github.kbiakov.codeview.CodeView;
+import io.github.kbiakov.codeview.OnCodeLineClickListener;
 import io.github.kbiakov.codeview.highlight.ColorTheme;
 
 public class ListingsActivity extends AppCompatActivity {
@@ -18,7 +18,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         //int myColor = ContextCompat.getColor(this, R.color.code_content_background);
 
-        CodeView codeView = (CodeView) findViewById(R.id.code_view);
+        final CodeView codeView = (CodeView) findViewById(R.id.code_view);
 
         // use chaining to build view
         codeView.highlightCode("js")
@@ -30,5 +30,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         codeView.setCodeContent(getString(R.string.listing_java));
         codeView.setColorTheme(ColorTheme.DEFAULT);
         codeView.highlightCode("java");
+
+        codeView.setCodeListener(new OnCodeLineClickListener() {
+            @Override
+            public void onCodeLineClicked(int n) {
+                Log.i("example", "Line: " + n);
+            }
+        });
     }
 }

example/src/main/res/layout/activity_listings.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
     tools:context=".ListingsActivity">
 
     <io.github.kbiakov.codeview.CodeView