Merge pull request #55 from kbiakov/feature/update

Update versions, code cleanup

Author: kbiakov

.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-27.0.3
- - android-27
+ - build-tools-28.0.3
+ - android-28
  - 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-27.0.3,android-27,extra-android-m2repository
+ - echo yes | android update sdk --no-ui --all --filter build-tools-28.0.3,android-28,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 &

README.md

@@ -1,8 +1,8 @@
 # CodeView (Android)
 
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-codeview--android-blue.svg)](https://android-arsenal.com/details/1/4216)
-[![Release](https://jitpack.io/v/kbiakov/CodeView-android.svg)](https://jitpack.io/#kbiakov/CodeView-android)
-[![Build Status](https://travis-ci.org/kbiakov/CodeView-android.svg?branch=master)](https://travis-ci.org/kbiakov/CodeView-android)
+[![Release](https://jitpack.io/v/kbiakov/CodeView-android.svg)](https://jitpack.io/#kbiakov/CodeView-Android)
+[![Build Status](https://travis-ci.org/kbiakov/CodeView-android.svg?branch=master)](https://travis-ci.org/kbiakov/CodeView-Android)
 <a href="http://www.methodscount.com/?lib=com.github.kbiakov%3ACodeView-android%3A1.3.0"><img src="https://img.shields.io/badge/Methods and size-core: 969 | 1396 KB-e91e63.svg"/></a>
 
 <b>CodeView</b> helps to show code content with syntax highlighting in native way.
@@ -29,7 +29,7 @@ allprojects {
 
 Add the dependency:
 ```groovy
-compile 'com.github.kbiakov:CodeView-android:1.3.1'
+compile 'com.github.kbiakov:CodeView-android:1.3.2'
 ```
 
 ## Usage

build.gradle

@@ -1,19 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
- ext.kotlin_version = '1.2.21'
+ ext.kotlinVersion = '1.3.11'
  ext.minSdk = 15
- ext.compileSdk = 27
- ext.buildTools = '27.0.3'
- ext.supportLibrary = '27.1.0'
+ ext.compileSdk = 28
+ ext.buildTools = '28.0.3'
+ ext.supportLibrary = '28.0.0'
 
  repositories {
  jcenter()
  google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+ classpath 'com.android.tools.build:gradle:3.3.0'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
  }
 }
 

codeview/build.gradle

@@ -9,7 +9,7 @@ android {
  minSdkVersion minSdk
  targetSdkVersion compileSdk
  versionCode 1
- versionName '1.3.0'
+ versionName '1.3.2'
  }
  buildTypes {
  release {
@@ -23,7 +23,7 @@ android {
 }
 
 dependencies {
- compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- compile "com.android.support:appcompat-v7:$supportLibrary"
- compile "com.android.support:recyclerview-v7:$supportLibrary"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+ implementation "com.android.support:appcompat-v7:$supportLibrary"
+ implementation "com.android.support:recyclerview-v7:$supportLibrary"
 }

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

@@ -22,7 +22,11 @@ import io.github.kbiakov.codeview.highlight.color
  *
  * @author Kirill Biakov
  */
-class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context, attrs) {
+class CodeView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyleAttr: Int = 0
+) : RelativeLayout(context, attrs, defStyleAttr) {
 
  private val vCodeList: RecyclerView
  private val vShadows: Map<ShadowPosition, View>
@@ -32,11 +36,12 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
  */
  init {
  inflate(context, R.layout.layout_code_view, this)
- checkStartAnimation(attrs)
+ attrs?.let(::checkStartAnimation)
 
- vCodeList = findViewById<RecyclerView>(R.id.rv_code_content)
- vCodeList.layoutManager = LinearLayoutManager(context)
- vCodeList.isNestedScrollingEnabled = true
+ vCodeList = findViewById<RecyclerView>(R.id.rv_code_content).apply {
+ layoutManager = LinearLayoutManager(context)
+ isNestedScrollingEnabled = true
+ }
 
  vShadows = mapOf(
  ShadowPosition.RightBorder to R.id.shadow_right_border,
@@ -227,9 +232,9 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
  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())
+ }.let { (orientation, color) ->
+ val colors = arrayOf(android.R.color.transparent, color)
+ GradientDrawable(orientation, colors.map(Int::color).toIntArray())
  }
  }
 }

codeview/src/main/java/io/github/kbiakov/codeview/views/BidirectionalScrollView.kt

@@ -68,17 +68,18 @@ class BidirectionalScrollView : HorizontalScrollView {
  }
 
  override fun measureChild(child: View, parentWidthMeasureSpec: Int, parentHeightMeasureSpec: Int) {
- val measureSpecZero = makeMeasureSpec(0)
- child.measure(measureSpecZero, measureSpecZero)
+ val zeroMeasureSpec = makeMeasureSpec(0)
+ child.measure(zeroMeasureSpec, zeroMeasureSpec)
  }
 
- 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)
- val childHeightMeasureSpec = makeMeasureSpec(params.topMargin + params.bottomMargin)
- child.measure(childWidthMeasureSpec, childHeightMeasureSpec)
+ override fun measureChildWithMargins(
+ child: View,
+ parentWidthMeasureSpec: Int, widthUsed: Int,
+ parentHeightMeasureSpec: Int, heightUsed: Int
+ ) = with(child.layoutParams as MarginLayoutParams) {
+ val widthMeasureSpec = makeMeasureSpec(leftMargin + rightMargin, MeasureSpec.UNSPECIFIED)
+ val heightMeasureSpec = makeMeasureSpec(topMargin + bottomMargin, MeasureSpec.UNSPECIFIED)
+ child.measure(widthMeasureSpec, heightMeasureSpec)
  }
 
  private fun makeMeasureSpec(size: Int) = makeMeasureSpec(size, MeasureSpec.UNSPECIFIED)

example/build.gradle

@@ -24,9 +24,11 @@ android {
 }
 
 dependencies {
- compile project(path: ':codeview')
- compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- compile "com.android.support:appcompat-v7:$supportLibrary"
+ implementation project(':codeview')
+
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+ implementation "com.android.support:appcompat-v7:$supportLibrary"
+ implementation "com.android.support:recyclerview-v7:$supportLibrary"
 }
 repositories {
  mavenCentral()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Mar 23 19:00:37 MSK 2018
+#Thu Jan 17 15:59:44 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip