Infinity line note views (not customizable) adding

Author: kbiakov

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

@@ -234,9 +234,14 @@ class CodeContentAdapter : RecyclerView.Adapter<CodeContentAdapter.ViewHolder> {
         notes?.let {
             holder.llLineNotes.visibility = if (it.isNotEmpty()) View.VISIBLE else View.GONE
 
+            val noteBg = colorTheme.bgNum.color()
+            val noteColor = colorTheme.noteColor.color()
+            var isFirst = true
+
             it.forEach { note ->
-                val noteView = LineNoteView.create(mContext, note, colorTheme.noteColor.color())
+                val noteView = LineNoteView.create(mContext, note, isFirst, noteBg, noteColor)
                 holder.llLineNotes.addView(noteView)
+                isFirst = false
             }
         }
     }
@@ -247,14 +252,14 @@ class CodeContentAdapter : RecyclerView.Adapter<CodeContentAdapter.ViewHolder> {
         val isLast = position == itemCount - 1
 
         if (isFirst || isLast) {
-            // itemView.layoutParams.height = dp8 * 4
+            // holder.itemView.layoutParams.height = dp8 * 4
 
             val topPadding = if (isFirst) dp8 else 0
             val bottomPadding = if (isLast) dp8 else 0
             holder.tvLineNum.setPadding(0, topPadding, 0, bottomPadding)
             holder.tvLineContent.setPadding(0, topPadding, 0, bottomPadding)
         } else {
-            // itemView.layoutParams.height = dp8 * 3
+            // holder.itemView.layoutParams.height = dp8 * 3
 
             holder.tvLineNum.setPadding(0, 0, 0, 0)
             holder.tvLineContent.setPadding(0, 0, 0, 0)
@@ -271,16 +276,14 @@ class CodeContentAdapter : RecyclerView.Adapter<CodeContentAdapter.ViewHolder> {
     class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         var tvLineNum: TextView
         var tvLineContent: TextView
-        var rlLineBlock: RelativeLayout
         var llLineNotes: LinearLayout
 
         var mItem: String? = null
 
         init {
             tvLineNum = itemView.findViewById(R.id.tv_line_num) as TextView
             tvLineContent = itemView.findViewById(R.id.tv_line_content) as TextView
-            rlLineBlock = itemView.findViewById(R.id.rl_line_block) as RelativeLayout
-            llLineNotes = itemView.findViewById(R.id.ll_line_notes) as LinearLayout
+            llLineNotes = itemView.findViewById(R.id.ll_line_footer) as LinearLayout
         }
 
         override fun toString() = "${super.toString()} '$mItem'"

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

@@ -3,14 +3,35 @@ package io.github.kbiakov.codeview
 import android.content.Context
 import android.widget.TextView
 
+/**
+ * Simple note view for code line.
+ *
+ * @author Kirill Biakov
+ */
 class LineNoteView(context: Context?) : TextView(context) {
 
     companion object Factory {
-        fun create(context: Context, text: String, textColor: Int): LineNoteView {
+        /**
+         * Simple factory method to create note view.
+         *
+         * @param context Context
+         * @param text Note text
+         * @param isFirst If is first note
+         * @param bgColor Background color
+         * @param textColor Text Color
+         * @return Created line note view
+         */
+        fun create(context: Context, text: String, isFirst: Boolean,
+                   bgColor: Int, textColor: Int): LineNoteView {
             val noteView = LineNoteView(context)
             noteView.textSize = 12f
             noteView.text = text
             noteView.setTextColor(textColor)
+            noteView.setBackgroundColor(bgColor)
+
+            val dp8 = dpToPx(context, 8)
+            noteView.setPadding(dpToPx(context, 48), if (isFirst) dp8 else 0, dp8, dp8)
+
             return noteView
         }
     }

codeview/src/main/res/layout/item_code_line.xml

@@ -2,13 +2,12 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:animateLayoutChanges="true">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/tv_line_num"
         android:layout_width="32dp"
-        android:layout_height="match_parent"
+        android:layout_height="24dp"
         android:gravity="center"
         android:fontFamily="monospace"
         android:textSize="12sp"
@@ -27,13 +26,12 @@
         android:textSize="12sp"
         android:text="@string/stub_line_content"/>
 
-    <!--
     <LinearLayout
-        android:id="@+id/ll_line_notes"
+        android:id="@+id/ll_line_footer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/tv_line_content"
         android:orientation="vertical"
-        android:visibility="gone"/>-->
+        android:visibility="gone"/>
 
 </RelativeLayout>

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

@@ -17,7 +17,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_listings);
 
-        //int myColor = ContextCompat.getColor(this, R.color.code_content_background);
+        // int myColor = ContextCompat.getColor(this, R.color.code_content_background);
 
         final CodeView codeView = (CodeView) findViewById(R.id.code_view);
 
@@ -28,7 +28,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         // do not use chaining for built view
         // (you can, but follow it should be performed sequentially)
-        codeView.setCodeContent(getString(R.string.mark));
+        codeView.setCodeContent(getString(R.string.listing_java));
         codeView.setColorTheme(ColorTheme.DEFAULT);
         codeView.highlightCode("java");