Fixed top & bottom padding

kbiakov · kbiakov · commit ef55a9bdcd1c · 2017-08-29T01:07:52.000+03:00
diff --git a/codeview/src/main/java/io/github/kbiakov/codeview/Utils.kt b/codeview/src/main/java/io/github/kbiakov/codeview/Utils.kt
@@ -7,12 +7,10 @@ import android.text.Html
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.TextUtils
-import android.util.Log
 import android.util.TypedValue
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.util.concurrent.Executors
-import java.util.stream.IntStream
 
 object Const {
     val DefaultDelay = 250L
diff --git a/codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt b/codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt
@@ -12,6 +12,8 @@ import android.widget.TextView
 import io.github.kbiakov.codeview.*
 import io.github.kbiakov.codeview.Thread.async
 import io.github.kbiakov.codeview.Thread.ui
+import io.github.kbiakov.codeview.adapters.AbstractCodeAdapter.ViewHolderType.Companion.BordersCount
+import io.github.kbiakov.codeview.adapters.AbstractCodeAdapter.ViewHolderType.Companion.LineStartIdx
 import io.github.kbiakov.codeview.classifier.CodeClassifier
 import io.github.kbiakov.codeview.classifier.CodeProcessor
 import io.github.kbiakov.codeview.highlight.*
@@ -174,33 +176,38 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
         val tvLineContent = lineView.findViewById(R.id.tv_line_content) as TextView
         tvLineContent.typeface = options.font
 
-        val holder = ViewHolder(lineView)
-        holder.setIsRecyclable(false)
-        return holder
+        val isLine = viewType == ViewHolderType.Line.viewType
+        val lineViewHeight = if (isLine) R.dimen.line_height else R.dimen.line_border_height
+        lineView.layoutParams.height = context.resources.getDimension(lineViewHeight).toInt()
+
+        if (isLine) {
+            val holder = LineViewHolder(lineView)
+            holder.setIsRecyclable(false)
+            return holder
+        } else {
+            return BorderViewHolder(lineView)
+        }
     }
 
     override fun onBindViewHolder(holder: ViewHolder, pos: Int) {
-        val codeLine = lines[pos]
-        holder.mItem = codeLine
-
-        options.lineClickListener?.let {
-            holder.itemView.setOnClickListener {
-                options.lineClickListener?.onCodeLineClicked(pos, codeLine)
+        if (holder is LineViewHolder) {
+            val lineNum = pos - LineStartIdx
+            val lineCode = lines[lineNum]
+            holder.mItem = lineCode
+
+            options.lineClickListener?.let {
+                holder.itemView.setOnClickListener {
+                    options.lineClickListener?.onCodeLineClicked(lineNum, lineCode)
+                }
             }
+            setupLine(lineNum, lineCode, holder)
+            displayLineFooter(lineNum, holder)
         }
-
-        setupLine(pos, codeLine, holder)
-        displayLineFooter(pos, holder)
-        addExtraPadding(pos, holder)
     }
 
-    override fun getItemCount() = lines.size
+    override fun getItemCount() = lines.size + BordersCount // lines + borders
 
-    private fun Int.isFirst() = this == 0
-    private fun Int.isLast() = this == itemCount - 1
-    private fun Int.isJustFirst() = isFirst() && !isLast()
-    private fun Int.isJustLast() = isLast() && !isFirst()
-    private fun Int.isBorder() = isFirst() || isLast()
+    override fun getItemViewType(pos: Int) = ViewHolderType.get(pos, itemCount)
 
     // - Helpers (for view holder)
 
@@ -209,7 +216,7 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
         holder.tvLineContent.text = html(line)
         holder.tvLineContent.setTextColor(options.theme.noteColor.color())
 
-        if (options.shortcut && pos == MAX_SHORTCUT_LINES) {
+        if (options.shortcut && pos == MaxShortcutLines) {
             holder.tvLineNum.textSize = 10f
             holder.tvLineNum.text = context.getString(R.string.dots)
         } else {
@@ -233,31 +240,38 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
         }
     }
 
-    private fun addExtraPadding(pos: Int, holder: ViewHolder) {
-        if (pos.isBorder()) {
-            val dp8 = dpToPx(context, 8)
-            val topPadding = if (pos.isJustFirst()) dp8 else 0
-            val bottomPadding = if (pos.isJustLast()) dp8 else 0
-            holder.tvLineNum.setPadding(0, topPadding, 0, bottomPadding)
-            holder.tvLineContent.setPadding(0, topPadding, 0, bottomPadding)
-        } else {
-            holder.tvLineNum.setPadding(0, 0, 0, 0)
-            holder.tvLineContent.setPadding(0, 0, 0, 0)
-        }
-    }
-
     companion object {
-        private const val MAX_SHORTCUT_LINES = 6
+        private const val MaxShortcutLines = 6
 
         private fun Pair<List<String>, List<String>>.linesToShow() = first
         private fun Pair<List<String>, List<String>>.droppedLines() = second
     }
 
+    // - ViewHolder
+
+    enum class ViewHolderType(val viewType: Int) {
+        Line(0), Border(1);
+
+        companion object {
+            const val LineStartIdx = 1
+            const val BordersCount = 2
+
+            fun Int.lineEndIdx() = this - BordersCount
+
+            fun get(pos: Int, n: Int) = when (pos) {
+                in LineStartIdx .. n.lineEndIdx() ->
+                    ViewHolderType.Line.viewType
+                else ->
+                    ViewHolderType.Border.viewType
+            }
+        }
+    }
+
     /**
      * View holder for code adapter.
      * Stores all views related to code line layout.
      */
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    open class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val tvLineNum = itemView.findViewById(R.id.tv_line_num) as TextView
         val tvLineContent = itemView.findViewById(R.id.tv_line_content) as TextView
         val llLineFooter = itemView.findViewById(R.id.ll_line_footer) as LinearLayout
@@ -266,6 +280,14 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
 
         override fun toString() = "${super.toString()} '$mItem'"
     }
+
+    class LineViewHolder(itemView: View) : ViewHolder(itemView)
+
+    /**
+     * View holder for padding.
+     * Stores all views related to code line layout.
+     */
+    class BorderViewHolder(itemView: View) : ViewHolder(itemView)
 }
 
 /**
diff --git a/codeview/src/main/java/io/github/kbiakov/codeview/views/BidirectionalScrollView.kt b/codeview/src/main/java/io/github/kbiakov/codeview/views/BidirectionalScrollView.kt
@@ -33,25 +33,20 @@ class BidirectionalScrollView : HorizontalScrollView {
                 currentY = event.rawY.toInt()
                 return super.dispatchTouchEvent(event)
             }
-
             MotionEvent.ACTION_MOVE -> {
                 val deltaX = Math.abs(currentX - event.rawX)
                 val deltaY = Math.abs(currentY - event.rawY)
                 scroll(event)
 
                 val movedOnDistance = dpToPx(context, 2)
-
                 if (deltaX > movedOnDistance || deltaY > movedOnDistance)
                     isMoved = true
             }
-
             MotionEvent.ACTION_UP -> {
                 if (!isMoved)
                     return super.dispatchTouchEvent(event)
-
                 isMoved = false
             }
-
             MotionEvent.ACTION_CANCEL -> isMoved = false
         }
         return true
@@ -69,21 +64,18 @@ class BidirectionalScrollView : HorizontalScrollView {
     }
 
     override fun measureChild(child: View, parentWidthMeasureSpec: Int, parentHeightMeasureSpec: Int) {
-        val childWidthMeasureSpec = makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
-        val childHeightMeasureSpec = makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
-        child.measure(childWidthMeasureSpec, childHeightMeasureSpec)
+        val measureSpecZero = makeMeasureSpec(0)
+        child.measure(measureSpecZero, measureSpecZero)
     }
 
     override fun measureChildWithMargins(child: View,
                                          parentWidthMeasureSpec: Int, widthUsed: Int,
                                          parentHeightMeasureSpec: Int, heightUsed: Int) {
         val params = child.layoutParams as MarginLayoutParams
-
-        val childWidthMeasureSpec = makeMeasureSpec(
-                params.leftMargin + params.rightMargin, MeasureSpec.UNSPECIFIED)
-        val childHeightMeasureSpec = makeMeasureSpec(
-                params.topMargin + params.bottomMargin, MeasureSpec.UNSPECIFIED)
-
+        val childWidthMeasureSpec = makeMeasureSpec(params.leftMargin + params.rightMargin)
+        val childHeightMeasureSpec = makeMeasureSpec(params.topMargin + params.bottomMargin)
         child.measure(childWidthMeasureSpec, childHeightMeasureSpec)
     }
+
+    private fun makeMeasureSpec(size: Int) = makeMeasureSpec(size, MeasureSpec.UNSPECIFIED)
 }
diff --git a/codeview/src/main/res/layout/item_code_line.xml b/codeview/src/main/res/layout/item_code_line.xml
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="@dimen/line_height">
 
     <TextView
         android:id="@+id/tv_line_num"
         android:layout_width="@dimen/line_num_width"
-        android:layout_height="@dimen/line_height"
+        android:layout_height="match_parent"
         android:gravity="center"
-        android:fontFamily="monospace"
         android:textSize="@dimen/line_text_size"
-        android:text="@string/stub_line_num"/>
+        tools:text="@string/stub_line_num"/>
 
     <TextView
         android:id="@+id/tv_line_content"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/line_height"
+        android:layout_height="match_parent"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_toRightOf="@+id/tv_line_num"
         android:gravity="center_vertical"
-        android:fontFamily="monospace"
-        android:singleLine="true"
+        android:maxLines="1"
         android:textSize="@dimen/line_text_size"
-        android:text="@string/stub_line_content"/>
+        tools:text="@string/stub_line_content"/>
 
     <LinearLayout
         android:id="@+id/ll_line_footer"
diff --git a/codeview/src/main/res/values/dimens.xml b/codeview/src/main/res/values/dimens.xml
@@ -2,5 +2,6 @@
 <resources>
     <dimen name="line_num_width">32dp</dimen>
     <dimen name="line_height">24dp</dimen>
+    <dimen name="line_border_height">6dp</dimen>
     <dimen name="line_text_size">12sp</dimen>
 </resources>
