From 3e23f6fe17ff084930a2010186abaa8a6b77859d Mon Sep 17 00:00:00 2001 From: Markus Ressel Date: Sun, 30 Dec 2018 06:09:59 +0100 Subject: [PATCH] added telegram script (#3) * updated to recent android sdk updated gradle to 4.6 update kotlin updated dependencies compile fix * update kotlin * disable hyphenation on line number textview and codeeditor as well * updated kotlin updated dependency * added travis-telegram-bot added missing travis files to git * use variable for GitHub url and Travis url * also push messages for master branch * test * test * additional telegram variable * apk file path now uses absolute path * fix bot id --- .idea/codeStyles/Project.xml | 29 ++++++++ build.gradle | 14 ++-- gradle/wrapper/gradle-wrapper.properties | 4 +- library/build.gradle | 2 +- .../kodeeditor/library/view/CodeEditText.kt | 8 ++- .../kodeeditor/library/view/CodeEditorView.kt | 5 ++ .../layout/view_code_editor__inner_layout.xml | 2 +- travis/build.sh | 15 +++++ travis/debug.keystore | Bin 0 -> 2146 bytes travis/distribute_result.sh | 62 ++++++++++++++++++ 10 files changed, 129 insertions(+), 12 deletions(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 travis/build.sh create mode 100644 travis/debug.keystore create mode 100644 travis/distribute_result.sh diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index eea2eb2..6c756b0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.61' + ext.kotlin_version = '1.3.11' ext { group = 'com.github.markusressel' - gradle_plugin_version = '3.1.3' + gradle_plugin_version = '3.2.1' minSdkVersion = 16 versionName = "0.5.0" @@ -14,17 +14,17 @@ buildscript { compileSdkVersion = 28 targetSdkVersion = 28 - buildToolsVersion = "27.0.3" + buildToolsVersion = "28.0.3" // DEPENDENCIES androidKtxVersion = "0.3" - supportLibVersion = "27.1.1" + supportLibVersion = "28.0.0" javaxAnnotationVersion = "10.0-b28" - aboutlibrariesVersion = "6.0.9" - materialdrawerVersion = "6.0.8" - iconicsVersion = "3.0.4" + aboutlibrariesVersion = "6.2.0" + materialdrawerVersion = "6.1.1" + iconicsVersion = "3.1.0" rxKotlinVersion = "2.3.0" rxBindingVersion = "2.1.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6e2838d..49fd964 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Aug 25 17:52:39 CEST 2018 +#Tue Oct 23 14:05:42 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/library/build.gradle b/library/build.gradle index dde0331..bc4f197 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation "com.trello.rxlifecycle2:rxlifecycle-android-lifecycle-kotlin:$rxLifecycleVersion" // Zoom Layout Container - api 'com.otaliastudios:zoomlayout:1.3.0' + api 'com.otaliastudios:zoomlayout:1.4.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' diff --git a/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditText.kt b/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditText.kt index b2c7fb4..1559402 100644 --- a/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditText.kt +++ b/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditText.kt @@ -1,7 +1,9 @@ package de.markusressel.kodeeditor.library.view import android.content.Context +import android.os.Build import android.support.v7.widget.AppCompatEditText +import android.text.Layout import android.util.AttributeSet import android.util.Log import com.jakewharton.rxbinding2.widget.RxTextView @@ -44,6 +46,10 @@ class CodeEditText : AppCompatEditText { } private fun reinit() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NONE + } + initSyntaxHighlighter() } @@ -98,7 +104,7 @@ class CodeEditText : AppCompatEditText { } syntaxHighlighter - ?.highlight(text) + ?.apply { highlight(text!!) } } companion object { diff --git a/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorView.kt b/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorView.kt index afb7a21..7e91a0b 100644 --- a/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorView.kt +++ b/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorView.kt @@ -4,12 +4,14 @@ import android.content.Context import android.content.res.TypedArray import android.graphics.Rect import android.graphics.drawable.Drawable +import android.os.Build import android.support.annotation.AttrRes import android.support.annotation.ColorInt import android.support.annotation.StringRes import android.support.annotation.StyleableRes import android.support.v4.content.ContextCompat import android.support.v4.view.ViewCompat +import android.text.Layout import android.util.AttributeSet import android.util.Log import android.util.TypedValue @@ -142,6 +144,9 @@ open class CodeEditorView : ZoomLayout { contentLayout = inflater.inflate(R.layout.view_code_editor__inner_layout, null) as LinearLayout lineNumberView = contentLayout.findViewById(R.id.codeLinesView) as TextView + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + lineNumberView.hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NONE + } dividerView = contentLayout.findViewById(R.id.divider) as View diff --git a/library/src/main/res/layout/view_code_editor__inner_layout.xml b/library/src/main/res/layout/view_code_editor__inner_layout.xml index 6858f43..8a75354 100644 --- a/library/src/main/res/layout/view_code_editor__inner_layout.xml +++ b/library/src/main/res/layout/view_code_editor__inner_layout.xml @@ -29,8 +29,8 @@ android:inputType="textMultiLine|textNoSuggestions" android:maxLength="99999999" android:maxLines="99999999" - android:scrollHorizontally="false" android:scrollbars="none" + android:scrollHorizontally="false" android:textSize="12sp" android:typeface="monospace" /> diff --git a/travis/build.sh b/travis/build.sh new file mode 100644 index 0000000..f67ec68 --- /dev/null +++ b/travis/build.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +echo "Travis Container environment variables:" +env | sort + +echo + +if [[ "${TRAVIS_BRANCH}" =~ "${TELEGRAM_BRANCHES}" ]]; then + echo "Start compiling and assembling apk..." + ./gradlew clean testDebug lintDebug assembleDebug --stacktrace +else + echo "Start compiling WITHOUT assembling apk..." + ./gradlew clean testDebug lintDebug --stacktrace +fi + diff --git a/travis/debug.keystore b/travis/debug.keystore new file mode 100644 index 0000000000000000000000000000000000000000..eaa735047df7f2b2cd7c5385bfdfd584676d14be GIT binary patch literal 2146 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/dev/null + +fi +