Fixed shadow color

Author: kbiakov

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

@@ -1,6 +1,8 @@
 package io.github.kbiakov.codeview
 
 import android.content.Context
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.util.AttributeSet
@@ -10,6 +12,8 @@ import io.github.kbiakov.codeview.Thread.delayed
 import io.github.kbiakov.codeview.adapters.AbstractCodeAdapter
 import io.github.kbiakov.codeview.adapters.CodeWithNotesAdapter
 import io.github.kbiakov.codeview.adapters.Options
+import io.github.kbiakov.codeview.highlight.ColorThemeData
+import io.github.kbiakov.codeview.highlight.color
 
 /**
  * @class CodeView
@@ -21,7 +25,7 @@ import io.github.kbiakov.codeview.adapters.Options
 class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context, attrs) {
 
     private val vCodeList: RecyclerView
-    private val vShadows: List<View>
+    private val vShadows: Map<ShadowPosition, View>
 
     /**
      * Primary constructor.
@@ -30,16 +34,15 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
         inflate(context, R.layout.layout_code_view, this)
         checkStartAnimation(attrs)
 
-        // TODO: add shadow color customization
-        vShadows = listOf(
-                R.id.v_shadow_right,
-                R.id.v_shadow_bottom_line,
-                R.id.v_shadow_bottom_content
-        ).map(this::findViewById)
-
         vCodeList = findViewById(R.id.rv_code_content) as RecyclerView
         vCodeList.layoutManager = LinearLayoutManager(context)
         vCodeList.isNestedScrollingEnabled = true
+
+        vShadows = mapOf(
+                ShadowPosition.RightBorder to R.id.shadow_right_border,
+                ShadowPosition.NumBottom to R.id.shadow_num_bottom,
+                ShadowPosition.ContentBottom to R.id.shadow_content_bottom
+        ).mapValues { findViewById(it.value) }
     }
 
     private fun checkStartAnimation(attrs: AttributeSet) {
@@ -81,11 +84,15 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
      * Border shadows will shown if full listing presented.
      * It helps to see what part of code is scrolled & hidden.
      *
-     * @param isShadows Is shadows needed
+     * @param isVisible Is shadows visible
      */
-    private fun setupShadows(isShadows: Boolean) {
-        val visibility = if (isShadows) VISIBLE else GONE
-        vShadows.forEach { it.visibility = visibility }
+    fun setupShadows(isVisible: Boolean) {
+        val visibility = if (isVisible) VISIBLE else GONE
+        val theme = getOptionsOrDefault().theme
+        vShadows.forEach { (pos, view) ->
+            view.visibility = visibility
+            view.setSafeBackground(pos.createShadow(theme))
+        }
     }
 
     // - Initialization
@@ -109,7 +116,6 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
      */
     fun setAdapter(adapter: AbstractCodeAdapter<*>) {
         vCodeList.adapter = adapter
-        setupShadows(adapter.options.shadows)
         highlight()
     }
 
@@ -129,12 +135,12 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
     fun updateOptions(options: Options) {
         getAdapter() ?: setOptions(options)
         getAdapter()?.options = options
+        setupShadows(options.shadows)
     }
 
-    fun updateOptions(): Options {
+    fun updateOptions(body: Options.() -> Unit) {
         val options = getOptions() ?: getOptionsOrDefault()
-        updateOptions(options)
-        return options
+        updateOptions(options.apply(body))
     }
 
     // - Adapter
@@ -199,6 +205,27 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
             }
             return false
         }
+
+        private fun View.setSafeBackground(newBackground: Drawable) {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+                background = newBackground
+            }
+        }
+    }
+
+    private enum class ShadowPosition {
+        RightBorder,
+        NumBottom,
+        ContentBottom;
+
+        fun createShadow(theme: ColorThemeData) = when (this) {
+            RightBorder -> GradientDrawable.Orientation.LEFT_RIGHT to theme.bgContent
+            NumBottom -> GradientDrawable.Orientation.TOP_BOTTOM to theme.bgNum
+            ContentBottom -> GradientDrawable.Orientation.TOP_BOTTOM to theme.bgContent
+        }.let {
+            val colors = arrayOf(android.R.color.transparent, it.second)
+            GradientDrawable(it.first, colors.map(Int::color).toIntArray())
+        }
     }
 }
 

codeview/src/main/java/io/github/kbiakov/codeview/highlight/CodeHighlighter.kt

@@ -222,6 +222,8 @@ enum class Font {
 
 // - Helpers
 
+const val transparent = "#00000000"
+
 /**
  * @return Converted hex int to color by adding alpha-channel
  */
@@ -271,7 +273,6 @@ fun String.withFontParams(color: String?): String {
         if (idx != indexOf("\n")) // if not replaced only once (for multiline tag coverage)
             parametrizedString.append(substring(idx).inFontTag(color))
     }
-
     return parametrizedString.toString()
 }
 

codeview/src/main/res/drawable/shadow_bottom_content.xml

@@ -20,31 +20,26 @@
     </io.github.kbiakov.codeview.views.BidirectionalScrollView>
 
     <View
-        android:id="@+id/v_shadow_right"
-        android:layout_width="24dp"
+        android:id="@+id/shadow_right_border"
+        android:layout_width="@dimen/shadow_width"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/shadow_right"
-        android:visibility="gone"/>
+        android:layout_alignParentRight="true"/>
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="16dp"
+        android:layout_height="@dimen/shadow_height"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal"
-        android:visibility="gone">
+        android:orientation="horizontal">
 
         <View
-            android:id="@+id/v_shadow_bottom_line"
-            android:layout_width="24dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/shadow_bottom_line"/>
+            android:id="@+id/shadow_num_bottom"
+            android:layout_width="@dimen/shadow_width"
+            android:layout_height="match_parent"/>
 
         <View
-            android:id="@+id/v_shadow_bottom_content"
+            android:id="@+id/shadow_content_bottom"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/shadow_bottom_content"/>
+            android:layout_height="match_parent"/>
 
     </LinearLayout>
 

codeview/src/main/res/drawable/shadow_bottom_line.xml

@@ -4,4 +4,6 @@
     <dimen name="line_height">24dp</dimen>
     <dimen name="line_border_height">4dp</dimen>
     <dimen name="line_text_size">12sp</dimen>
+    <dimen name="shadow_width">24dp</dimen>
+    <dimen name="shadow_height">16dp</dimen>
 </resources>