Merge pull request #5 from judemanutd/bugfix/text-color

Fixed text color issue

README.md

@@ -16,7 +16,7 @@ Add this to your module's build.gradle file:
 
 dependencies {
     // ... other dependencies
-    implementation 'com.github.judemanutd:katexview:1.0.1'
+    implementation 'com.github.judemanutd:katexview:1.0.2'
 }
 
 ```
@@ -28,7 +28,7 @@ dependencies {
 <dependency>
   <groupId>com.github.judemanutd</groupId>
   <artifactId>katexview</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <type>pom</type>
 </dependency>
 

app/build.gradle

@@ -28,9 +28,9 @@ dependencies {
     api project(':katexview')
 
     /* Test tools */
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0-alpha03'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha03'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test:runner:1.3.0-alpha03'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha03'
 
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin
     implementation 'androidx.appcompat:appcompat:' + versions.androidxCore

app/src/main/java/com/judemanutd/katexviewexample/KatexExampleActivity.kt

@@ -1,5 +1,6 @@
 package com.judemanutd.katexviewexample
 
+import android.graphics.Color
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import kotlinx.android.synthetic.main.activity_katex_example.*
@@ -13,5 +14,8 @@ class KatexExampleActivity : AppCompatActivity() {
         val text = "$$ c = \\pm\\sqrt{a^2 + b^2} $$"
 
         katex_text.setText(text)
+
+        katex_text_2.setText(text)
+        katex_text_2.setTextColor(Color.BLUE)
     }
 }

app/src/main/res/layout/activity_katex_example.xml

@@ -4,12 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".KatexExampleActivity">
 
     <com.judemanutd.katexview.KatexView
         android:id="@+id/katex_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:textColor="@color/colorPrimary" />
+        app:textColor="@color/colorAccent" />
+
+    <com.judemanutd.katexview.KatexView
+        android:id="@+id/katex_text_2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp" />
 
 </LinearLayout>

build.gradle

@@ -1,8 +1,9 @@
+apply plugin: "com.github.ben-manes.versions"
 apply from: './dependencies.gradle'
 
 buildscript {
     apply from: './dependencies.gradle'
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = versions.kotlin
     repositories {
         google()
         jcenter()
@@ -16,6 +17,7 @@ buildscript {
 
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
+        classpath "com.github.ben-manes:gradle-versions-plugin:" + versions.gradleVersion
     }
 }
 

dependencies.gradle

@@ -13,9 +13,11 @@ ext.versions = [
         bintrayPlugin     : '0.9',
 
         // AndroidX
-        androidxCore      : '1.1.0-alpha02',
-        androidxKotlinCore: '1.1.0-alpha05',
+        androidxCore      : '1.2.0-alpha02',
+        androidxKotlinCore: '1.3.0-alpha01',
 
         // Kotlin
-        kotlin            : '1.3.21',
+        kotlin            : '1.3.61',
+
+        gradleVersion      : '0.27.0'
 ]

katexview/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 
@@ -18,7 +18,7 @@ ext {
     siteUrl = 'https://github.com/judemanutd/KatexView'
     gitUrl = 'https://github.com/judemanutd/KatexView.git'
 
-    libraryVersion = '1.0.1'
+    libraryVersion = '1.0.2'
 
     developerId = 'judemanutd'
     developerName = 'Jude Fernandes'
@@ -36,7 +36,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
         versionCode 2
-        versionName "1.0.1"
+        versionName "1.0.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -58,9 +58,9 @@ dependencies {
 
     implementation 'com.x5dev:chunk-templates:3.5.0'
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test:runner:1.3.0-alpha03'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha03'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {

katexview/src/main/assets/themes/katex.chtml

@@ -8,7 +8,7 @@
          body {
              margin : 0;
              padding : 0;
-             color : {$textColor}
+             color: {$textColor} !important;
              -webkit-touch-callout: none!important;
              -webkit-user-select: none!important;
              user-select: none!important;

katexview/src/main/java/com/judemanutd/katexview/KatexView.kt

@@ -12,15 +12,19 @@ import com.x5.template.providers.AndroidTemplates
 import androidx.core.content.ContextCompat
 
 @SuppressLint("SetJavaScriptEnabled")
-class KatexView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) :
-        WebView(context, attrs, defStyleAttr) {
+class KatexView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) :
+    WebView(context, attrs, defStyleAttr) {
 
     private val TAG_FORMULA: String = "formula"
     private val TAG_TEXT_COLOR: String = "textColor"
 
     private var mText: String? = null
     //TODO: pick theme set text color
-    private var mTextColor: Int = android.R.color.black
+    private var mTextColor: Int = android.R.color.holo_purple
 
     init {
         settings.allowFileAccess = true
@@ -37,10 +41,10 @@ class KatexView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
 
         try {
             setTextColor(
-                    mTypeArray.getColor(
-                            R.styleable.KatexView_textColor,
-                            ContextCompat.getColor(getContext(), android.R.color.black)
-                    )
+                mTypeArray.getColor(
+                    R.styleable.KatexView_textColor,
+                    ContextCompat.getColor(getContext(), android.R.color.black)
+                )
             )
 
             val text: String? = mTypeArray.getString(R.styleable.KatexView_text)