Added line spacing customization

Author: kbiakov

codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt

@@ -177,16 +177,15 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
         tvLineContent.typeface = options.font
 
         val isLine = viewType == ViewHolderType.Line.viewType
-        val viewHeight = if (isLine) R.dimen.line_height else R.dimen.line_border_height
-        lineView.layoutParams.height = context.resources.getDimension(viewHeight).toInt()
-
-        if (isLine) {
+        options.format.apply {
+            val height = if (isLine) lineHeight else borderHeight
+            lineView.layoutParams.height = dpToPx(context, height)
+        }
+        return if (isLine) {
             val holder = LineViewHolder(lineView)
             holder.setIsRecyclable(false)
-            return holder
-        } else {
-            return BorderViewHolder(lineView)
-        }
+            holder
+        } else BorderViewHolder(lineView)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, pos: Int) {
@@ -213,14 +212,17 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
 
     @SuppressLint("SetTextI18n")
     private fun setupLine(pos: Int, line: String, holder: ViewHolder) {
+        val fontSize = options.format.fontSize
+
+        holder.tvLineContent.textSize = fontSize
         holder.tvLineContent.text = html(line)
         holder.tvLineContent.setTextColor(options.theme.noteColor.color())
 
         if (options.shortcut && pos == MaxShortcutLines) {
-            holder.tvLineNum.textSize = 10f
+            holder.tvLineNum.textSize = fontSize * Format.ShortcutScale
             holder.tvLineNum.text = context.getString(R.string.dots)
         } else {
-            holder.tvLineNum.textSize = 12f
+            holder.tvLineNum.textSize = fontSize
             holder.tvLineNum.text = "${pos + 1}"
         }
     }
@@ -313,6 +315,7 @@ data class Options(
         var language: String? = null,
         var theme: ColorThemeData = ColorTheme.DEFAULT.theme(),
         var font: Typeface = FontCache.get(context).getTypeface(context),
+        var format: Format = Format.Compact,
         var shadows: Boolean = false,
         var shortcut: Boolean = false,
         var shortcutNote: String = context.getString(R.string.show_all),
@@ -401,3 +404,21 @@ data class Options(
         fun get(context: Context) = Options(context)
     }
 }
+
+data class Format(val scaleFactor: Float = 1f,
+                  val lineHeight: Int = (LineHeight * scaleFactor).toInt(),
+                  val borderHeight: Int = (BorderHeight * scaleFactor).toInt(),
+                  val fontSize: Float = FontSize.toFloat()) {
+
+    companion object Default {
+        private const val LineHeight = 18
+        private const val BorderHeight = 3
+        private const val FontSize = 12
+
+        internal const val ShortcutScale = 0.83f
+
+        val ExtraCompact = Format(0.88f)
+        val Compact = Format()
+        val Medium = Format(1.33f)
+    }
+}

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

@@ -10,6 +10,7 @@
 import io.github.kbiakov.codeview.CodeView;
 import io.github.kbiakov.codeview.OnCodeLineClickListener;
 import io.github.kbiakov.codeview.adapters.CodeWithDiffsAdapter;
+import io.github.kbiakov.codeview.adapters.Format;
 import io.github.kbiakov.codeview.adapters.Options;
 import io.github.kbiakov.codeview.highlight.ColorTheme;
 import io.github.kbiakov.codeview.highlight.ColorThemeData;
@@ -59,6 +60,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 "js",                                   // language
                 ColorTheme.MONOKAI.theme(),             // theme (data)
                 FontCache.get(this).getTypeface(this),  // font
+                Format.Default.getCompact(),            // format
                 true,                                   // shadows
                 true,                                   // shortcut
                 getString(R.string.show_all),           // shortcut note
@@ -117,5 +119,51 @@ public void onCodeLineClicked(int n, @NotNull String line) {
 
         codeView.getOptions()
                 .shortcut(10, "Show all");
+
+        // - Playground
+        
+        codeView.getOptions()
+                .withFont(Font.Consolas)
+                .setShortcut(false);
+        codeView.setCode("" +
+                "package io.github.kbiakov.codeviewexample;\n" +
+                "\n" +
+                "import android.os.Bundle;\n" +
+                "import android.support.annotation.Nullable;\n" +
+                "import android.support.v7.app.AppCompatActivity;\n" +
+                "import android.util.Log;\n" +
+                "\n" +
+                "import org.jetbrains.annotations.NotNull;\n" +
+                "\n" +
+                "import io.github.kbiakov.codeview.CodeView;\n" +
+                "import io.github.kbiakov.codeview.OnCodeLineClickListener;\n" +
+                "import io.github.kbiakov.codeview.adapters.CodeWithDiffsAdapter;\n" +
+                "import io.github.kbiakov.codeview.adapters.Options;\n" +
+                "import io.github.kbiakov.codeview.highlight.ColorTheme;\n" +
+                "import io.github.kbiakov.codeview.highlight.ColorThemeData;\n" +
+                "import io.github.kbiakov.codeview.highlight.Font;\n" +
+                "import io.github.kbiakov.codeview.highlight.FontCache;\n" +
+                "import io.github.kbiakov.codeview.views.DiffModel;\n" +
+                "\n" +
+                "public class ListingsActivity extends AppCompatActivity {\n" +
+                "\n" +
+                "    @Override\n" +
+                "    protected void onCreate(@Nullable Bundle savedInstanceState) {\n" +
+                "        super.onCreate(savedInstanceState);\n" +
+                "        setContentView(R.layout.activity_listings);\n" +
+                "\n" +
+                "        final CodeView codeView = (CodeView) findViewById(R.id.code_view);\n" +
+                "\n" +
+                "        /*\n" +
+                "         * 1: set code content\n" +
+                "         */\n" +
+                "\n" +
+                "        // auto language recognition\n" +
+                "        codeView.setCode(getString(R.string.listing_js));\n" +
+                "\n" +
+                "        // specify language for code listing\n" +
+                "        codeView.setCode(getString(R.string.listing_py), \"py\");" +
+                "    }\n" +
+                "}", "java");
     }
 }