Fixed view size stretching

Author: kbiakov

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

@@ -35,7 +35,6 @@ import java.util.*
  */
 class CodeView : RelativeLayout {
 
-    private val vRoot: View
     private val vPlaceholder: View
     private val vShadowRight: View
     private val vShadowBottomLine: View
@@ -61,7 +60,6 @@ class CodeView : RelativeLayout {
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         inflater.inflate(R.layout.layout_code_view, this, true)
 
-        vRoot = findViewById(R.id.v_root)
         vPlaceholder = findViewById(R.id.v_placeholder)
         vShadowRight = findViewById(R.id.v_shadow_right)
         vShadowBottomLine = findViewById(R.id.v_shadow_bottom_line)
@@ -145,13 +143,11 @@ class CodeView : RelativeLayout {
     // default color theme provided by enum
     fun setColorTheme(colorTheme: ColorTheme) = addTask {
         adapter.colorTheme = colorTheme.with()
-        fillBackground(colorTheme.bgContent)
     }
 
     // custom color theme provided by user
     fun setColorTheme(colorTheme: ColorThemeData) = addTask {
         adapter.colorTheme = colorTheme
-        fillBackground(colorTheme.bgContent)
     }
 
     /**
@@ -207,10 +203,10 @@ class CodeView : RelativeLayout {
                 build(content)
             ViewState.PREPARE ->
                 Thread.delayed {
-                    adapter.updateCodeContent(content)
+                    update(content)
                 }
             ViewState.PRESENTED ->
-                adapter.updateCodeContent(content)
+                update(content)
         }
     }
 
@@ -231,13 +227,25 @@ class CodeView : RelativeLayout {
         Thread.delayed {
             rvCodeContent.adapter = CodeContentAdapter(context, content)
             processBuildTasks()
-            //fillBackground()
             setupShadows()
             hidePlaceholder()
             state = ViewState.PRESENTED
         }
     }
 
+    /**
+     * Hot view updating.
+     *
+     * @param content Code content
+     */
+    private fun update(content: String) {
+        state = ViewState.PREPARE
+        measurePlaceholder(extractLines(content).size)
+        adapter.updateCodeContent(content)
+        hidePlaceholder()
+        state = ViewState.PRESENTED
+    }
+
     // - Setup actions
 
     /**
@@ -246,27 +254,24 @@ class CodeView : RelativeLayout {
      */
     private fun setupShadows() = setShadowsVisible(!adapter.isFullShowing)
 
-    /**
-     * Fill background to color accordingly to color theme.
-     *
-     * @color Background color
-     */
-    private fun fillBackground(color: Int = adapter.colorTheme.bgContent) =
-            vRoot.setBackgroundColor(color.color())
-
     /**
      * Placeholder fills space at start and stretched to marked up view size
-     * (by extracting code lines) because at this point it's not built yet.
+     * (by code lines count) because at this point it's not built yet.
      *
      * @param linesCount Count of lines to measure space for placeholder
      */
     private fun measurePlaceholder(linesCount: Int) {
         val lineHeight = dpToPx(context, 24)
-        val topMargin = dpToPx(context, 8)
-        val height = linesCount * lineHeight + 2 * topMargin
+        val topPadding = dpToPx(context, 8)
+
+        // double padding (top & bottom) for big view, one is enough for small
+        val padding = (if (linesCount > 1) 2 else 1) * topPadding
+
+        val height = linesCount * lineHeight + padding
 
         vPlaceholder.layoutParams = RelativeLayout.LayoutParams(
                 RelativeLayout.LayoutParams.MATCH_PARENT, height)
+        vPlaceholder.visibility = View.VISIBLE
     }
 
     // - Animations

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

@@ -3,13 +3,13 @@
     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:id="@+id/v_root">
+    android:layout_height="wrap_content">
 
     <io.github.kbiakov.codeview.BidirectionalScrollView
         android:id="@+id/v_scroll"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fillViewport="true">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rv_code_content"
@@ -25,27 +25,26 @@
         android:layout_height="match_parent"
         android:layout_alignParentRight="true"
         android:background="@drawable/shadow_right"
-        android:visibility="invisible"/>
+        android:visibility="gone"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="16dp"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:visibility="gone">
 
         <View
             android:id="@+id/v_shadow_bottom_line"
             android:layout_width="24dp"
             android:layout_height="match_parent"
-            android:background="@drawable/shadow_bottom_line"
-            android:visibility="invisible"/>
+            android:background="@drawable/shadow_bottom_line"/>
 
         <View
             android:id="@+id/v_shadow_bottom_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/shadow_bottom_content"
-            android:visibility="invisible"/>
+            android:background="@drawable/shadow_bottom_content"/>
 
     </LinearLayout>
 

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

@@ -22,12 +22,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         // use chaining to build view
         codeView.highlightCode("js")
-                //.setColorTheme(ColorTheme.SOLARIZED_LIGHT.withBgContent(myColor))
+                .setColorTheme(ColorTheme.SOLARIZED_LIGHT)
                 .setCodeContent(getString(R.string.listing_js));
 
         // do not use chaining for built view
         // (you can, but follow it should be performed sequentially)
         codeView.setCodeContent(getString(R.string.listing_java));
+        codeView.setColorTheme(ColorTheme.DEFAULT);
         codeView.highlightCode("java");
     }
 }

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

@@ -9,12 +9,6 @@
     <io.github.kbiakov.codeview.CodeView
         android:id="@+id/code_view"
         android:layout_width="match_parent"
-        android:layout_height="120dp"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/code_view"
-        android:text="123123123123"/>
+        android:layout_height="wrap_content"/>
 
 </RelativeLayout>