Merge pull request #42 from kbiakov/feature/update_versions

kbiakov · web-flow · commit 9b5c128b2367 · 2018-03-26T16:08:42.000+03:00
Update versions, code cleanup
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,8 @@ android:
     - tools # to get the new `repository-11.xml`
     - tools # to install latest Android SDK tools
     - platform-tools
-    - build-tools-25.0.3
-    - android-25
+    - build-tools-27.0.3
+    - android-27
     - extra-android-m2repository # Design Support library
     - android-21
     - sys-img-armeabi-v7a-android-21 # system image (emulator)
@@ -24,7 +24,7 @@ env:
 
 before_script:
   # Automatically accept all SDK licences
-  - echo yes | android update sdk --no-ui --all --filter build-tools-24.0.2,android-24,extra-android-m2repository
+  - echo yes | android update sdk --no-ui --all --filter build-tools-27.0.3,android-27,extra-android-m2repository
   # Emulator Management: create, start & wait
   - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
   - emulator -avd test -no-skin -no-audio -no-window &
diff --git a/build.gradle b/build.gradle
@@ -1,22 +1,26 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.2-5'
+    ext.kotlin_version = '1.2.21'
+    ext.minSdk = 15
+    ext.compileSdk = 27
+    ext.buildTools = '27.0.3'
+    ext.supportLibrary = '27.1.0'
+
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/codeview/build.gradle b/codeview/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion compileSdk
+    buildToolsVersion buildTools
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 25
+        minSdkVersion minSdk
+        targetSdkVersion compileSdk
         versionCode 1
         versionName '1.3.0'
     }
@@ -24,7 +24,6 @@ android {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile "com.android.support:appcompat-v7:$supportLibrary"
+    compile "com.android.support:recyclerview-v7:$supportLibrary"
 }
diff --git a/codeview/src/main/java/io/github/kbiakov/codeview/CodeView.kt b/codeview/src/main/java/io/github/kbiakov/codeview/CodeView.kt
@@ -34,15 +34,17 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
         inflate(context, R.layout.layout_code_view, this)
         checkStartAnimation(attrs)
 
-        vCodeList = findViewById(R.id.rv_code_content) as RecyclerView
+        vCodeList = findViewById<RecyclerView>(R.id.rv_code_content)
         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) }
+        ).mapValues {
+            findViewById<View>(it.value)
+        }
     }
 
     private fun checkStartAnimation(attrs: AttributeSet) {
@@ -52,8 +54,9 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
             animate()
                     .setDuration(Const.DefaultDelay * 5)
                     .alpha(Const.Alpha.Initial)
-        } else
+        } else {
             alpha = Const.Alpha.Initial
+        }
     }
 
     private fun AbstractCodeAdapter<*>.checkHighlightAnimation(action: () -> Unit) {
@@ -65,7 +68,9 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
                 animate().alpha(Const.Alpha.Visible)
                 action()
             }
-        } else action()
+        } else {
+            action()
+        }
     }
 
     /**
@@ -75,7 +80,7 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
     private fun highlight() {
         getAdapter()?.apply {
             highlight {
-                checkHighlightAnimation(this::notifyDataSetChanged)
+                checkHighlightAnimation(::notifyDataSetChanged)
             }
         }
     }
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
@@ -62,9 +62,9 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
         extractLines(options.code).apply {
             if (!options.shortcut || size <= options.maxLines) // limit is not reached, show full
                 lines = this
-            else slice(options.maxLines).apply {
-                lines = linesToShow() + options.shortcutNote.toUpperCase()
-                droppedLines = droppedLines()
+            else slice(options.maxLines).let { (linesToShow, dropped) ->
+                lines = linesToShow + options.shortcutNote.toUpperCase()
+                droppedLines = dropped
             }
         }
     }
@@ -178,15 +178,15 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
         tvLineContent.typeface = options.font
 
         val isLine = viewType == ViewHolderType.Line.viewType
+
         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)
-            holder
-        } else BorderViewHolder(lineView)
+        return if (isLine)
+            LineViewHolder(lineView).apply { setIsRecyclable(false) }
+        else
+            BorderViewHolder(lineView)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, pos: Int) {
@@ -207,9 +207,9 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
     // - Helpers (for view holder)
 
     private fun bindClickListener(pos: Int, holder: ViewHolder) {
-        options.lineClickListener?.let {
-            holder.itemView.setOnClickListener {
-                options.lineClickListener?.onCodeLineClicked(pos, lines[pos])
+        holder.itemView.setOnClickListener {
+            options.lineClickListener?.apply {
+                onCodeLineClicked(pos, lines[pos])
             }
         }
     }
@@ -238,23 +238,21 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
     private fun displayFooter(pos: Int, holder: ViewHolder) {
         val entityList = footerEntities[pos]
 
-        holder.llLineFooter.removeAllViews()
+        holder.llLineFooter.apply {
+            removeAllViews()
 
-        entityList?.let {
-            holder.llLineFooter.visibility = if (it.isNotEmpty()) View.VISIBLE else View.GONE
+            entityList?.apply {
+                visibility = if (isNotEmpty()) View.VISIBLE else View.GONE
 
-            it.forEachIndexed { idx, entity ->
-                val footerView = createFooter(context, entity, idx == 0)
-                holder.llLineFooter.addView(footerView)
+                forEachIndexed { idx, entity ->
+                    addView(createFooter(context, entity, idx == 0))
+                }
             }
         }
     }
 
     companion object {
         private const val MaxShortcutLines = 6
-
-        private fun Pair<List<String>, List<String>>.linesToShow() = first
-        private fun Pair<List<String>, List<String>>.droppedLines() = second
     }
 
     // - View holder types
@@ -266,7 +264,7 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
             const val LineStartIdx = 1
             const val BordersCount = 2
 
-            fun Int.lineEndIdx() = this - BordersCount
+            private fun Int.lineEndIdx() = this - BordersCount
 
             fun get(pos: Int, n: Int) = when (pos) {
                 in LineStartIdx .. n.lineEndIdx() ->
@@ -336,114 +334,53 @@ data class Options(
 
     internal var isHighlighted: Boolean = false
 
-    fun withCode(code: String): Options {
-        this.code = code
-        return this
-    }
-
-    fun withCode(codeResId: Int): Options {
-        this.code = context.getString(codeResId)
-        return this
-    }
-
-    fun setCode(codeResId: Int) {
-        withCode(codeResId)
-    }
-
-    fun withLanguage(language: String): Options {
-        this.language = language
-        return this
-    }
-
-    fun withTheme(theme: ColorThemeData): Options {
-        this.theme = theme
-        return this
-    }
-
-    fun withTheme(theme: ColorTheme): Options {
-        this.theme = theme.theme()
-        return this
-    }
+    fun withCode(code: String) = apply { this.code = code }
+    fun withCode(codeResId: Int) = apply { code = context.getString(codeResId) }
+    fun setCode(codeResId: Int) { withCode(codeResId) }
+    fun withLanguage(language: String) = apply { this.language = language }
 
-    fun setTheme(theme: ColorTheme) {
-        withTheme(theme)
-    }
+    fun withTheme(theme: ColorThemeData) = apply { this.theme = theme }
+    fun withTheme(theme: ColorTheme) = apply { this.theme = theme.theme() }
+    fun setTheme(theme: ColorTheme) { withTheme(theme) }
 
-    fun withFont(font: Font): Options {
-        this.font = FontCache.get(context).getTypeface(context, font)
-        return this
-    }
+    fun withFont(font: Font) = apply { this.font = font.get() }
+    fun withFont(font: Typeface) = font saveAndThen { apply { this.font = font } }
+    fun withFont(fontPath: String) = apply { this.font = fontPath.get() }
+    fun setFont(fontPath: String) { withFont(fontPath) }
+    fun setFont(font: Font) { withFont(font) }
+    fun withFormat(format: Format) = apply { this.format = format }
 
-    fun withFont(font: Typeface): Options {
-        FontCache.get(context).saveTypeface(font)
-        this.font = font
-        return this
-    }
+    fun animateOnHighlight() = apply { animateOnHighlight = true }
+    fun disableHighlightAnimation() = apply { animateOnHighlight = false }
+    fun withShadows() = apply { shadows = true }
+    fun withoutShadows() = apply { shadows = false }
 
-    fun withFont(fontPath: String): Options {
-        this.font = FontCache.get(context).getTypeface(context, fontPath)
-        return this
-    }
+    fun addCodeLineClickListener(listener: OnCodeLineClickListener) = apply { lineClickListener = listener }
+    fun removeCodeLineClickListener() = apply { lineClickListener = null }
 
-    fun setFont(fontPath: String) {
-        withFont(fontPath)
-    }
-
-    fun setFont(font: Font) {
-        withFont(font)
-    }
-
-    fun withFormat(format: Format): Options {
-        this.format = format
-        return this
-    }
-
-    fun animateOnHighlight(): Options {
-        this.animateOnHighlight = true
-        return this
-    }
-
-    fun disableHighlightAnimation(): Options {
-        this.animateOnHighlight = false
-        return this
-    }
-
-    fun withShadows(): Options {
-        this.shadows = true
-        return this
-    }
-
-    fun withoutShadows(): Options {
-        this.shadows = false
-        return this
-    }
-
-    fun shortcut(maxLines: Int, shortcutNote: String): Options {
+    fun shortcut(maxLines: Int, shortcutNote: String) = apply {
         this.shortcut = true
         this.maxLines = maxLines
         this.shortcutNote = shortcutNote
-        return this
-    }
-
-    fun addCodeLineClickListener(listener: OnCodeLineClickListener): Options {
-        this.lineClickListener = listener
-        return this
-    }
-
-    fun removeCodeLineClickListener(): Options {
-        this.lineClickListener = null
-        return this
     }
 
     companion object Default {
         fun get(context: Context) = Options(context)
     }
+
+    // - Font helpers
+
+    private val fontCache = FontCache.get(context)
+    private fun Font.get() = fontCache.getTypeface(context, this)
+    private fun String.get() = fontCache.getTypeface(context, this)
+    private infix fun <T> Typeface.saveAndThen(body: () -> T): T = fontCache.saveTypeface(this).let { body() }
 }
 
-data class Format(val scaleFactor: Float = 1f,
-                  val lineHeight: Int = (LineHeight * scaleFactor).toInt(),
-                  val borderHeight: Int = (BorderHeight * scaleFactor).toInt(),
-                  val fontSize: Float = FontSize.toFloat()) {
+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
diff --git a/codeview/src/main/java/io/github/kbiakov/codeview/highlight/CodeHighlighter.kt b/codeview/src/main/java/io/github/kbiakov/codeview/highlight/CodeHighlighter.kt
@@ -237,20 +237,21 @@ infix fun String.applyFontParams(color: String?): String {
     var idx = 0
     var newIdx = indexOf("\n")
 
-    if (newIdx.notFound()) // covers expected tag coverage (within only one line)
+    if (newIdx.notFound()) { // covers expected tag coverage (within only one line)
         parametrizedString += inFontTag(color)
-    else { // may contain multiple lines with line breaks
+    } else { // may contain multiple lines with line breaks
 
         // put tag on the borders (end & start of line, ..., end of tag)
         do { // until closing tag is reached
-            parametrizedString += (substring(idx .. newIdx - 1) inFontTag color) + "\n"
+            parametrizedString += "${substring(idx until newIdx) inFontTag color}\n"
 
             idx = newIdx + 1
             newIdx = indexOf("\n", idx)
         } while (newIdx.isFound())
 
-        if (idx != indexOf("\n")) // if not replaced only once (for multiline tag coverage)
+        if (idx != indexOf("\n")) { // if not replaced only once (for multiline tag coverage)
             parametrizedString += substring(idx) inFontTag color
+        }
     }
     return parametrizedString
 }
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
diff --git a/example/build.gradle b/example/build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,26 @@`
`1`	`1`	`// Top-level build file where you can add configuration options common to all sub-projects/modules.`
`2`	`2`
`3`	`3`	`buildscript {`
`4`		`- ext.kotlin_version = '1.1.2-5'`
	`4`	`+ ext.kotlin_version = '1.2.21'`
	`5`	`+ ext.minSdk = 15`
	`6`	`+ ext.compileSdk = 27`
	`7`	`+ ext.buildTools = '27.0.3'`
	`8`	`+ ext.supportLibrary = '27.1.0'`
	`9`	`+`
`5`	`10`	`repositories {`
`6`	`11`	`jcenter()`
	`12`	`+ google()`
`7`	`13`	`}`
`8`	`14`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:2.3.3'`
	`15`	`+ classpath 'com.android.tools.build:gradle:3.0.1'`
`10`	`16`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`11`		`-`
`12`		`- // NOTE: Do not place your application dependencies here; they belong`
`13`		`- // in the individual module build.gradle files`
`14`	`17`	`}`
`15`	`18`	`}`
`16`	`19`
`17`	`20`	`allprojects {`
`18`	`21`	`repositories {`
`19`	`22`	`jcenter()`
	`23`	`+ google()`
`20`	`24`	`}`
`21`	`25`	`}`
`22`	`26`