Cleaning code

jstarczewski · jstarczewski · commit 5dbd7855ee2a · 2018-11-26T21:00:54.000+01:00
diff --git a/app/src/main/java/com/jstarczewski/pc/mathviewexample/RecyclerViewExampleActivity.kt b/app/src/main/java/com/jstarczewski/pc/mathviewexample/RecyclerViewExampleActivity.kt
@@ -1,14 +1,12 @@
 package com.jstarczewski.pc.mathviewexample
 
-import android.graphics.Color
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.jstarczewski.pc.mathview.src.TextAlign
 import kotlinx.android.synthetic.main.match_item.view.*
 
 class RecyclerViewExampleActivity : AppCompatActivity() {
@@ -52,7 +50,7 @@ class MathTestAdapter(private var equations: ArrayList<Equation>) : RecyclerView
         val view = LayoutInflater.from(viewGroup.context).inflate(R.layout.match_item, viewGroup, false)
         val holder: MathTestAdapter.ViewHolder = ViewHolder(view)
         holder.mvEquation.setBackgroundColor("#EEEEEE")
-        holder.mvEquation.setTextSizeBasedOnDpiDensity(80)
+        holder.mvEquation.setTextZoom(70)
         return ViewHolder(view)
     }
 
diff --git a/app/src/main/res/layout/match_item.xml b/app/src/main/res/layout/match_item.xml
@@ -10,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
+        android:textSize="16sp"
         app:layout_constraintBottom_toTopOf="@id/mvTest"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"/>
diff --git a/mathview/src/main/java/com/jstarczewski/pc/mathview/src/MathView.kt b/mathview/src/main/java/com/jstarczewski/pc/mathview/src/MathView.kt
@@ -2,7 +2,6 @@ package com.jstarczewski.pc.mathview.src
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.Color
 import android.os.Build
 import android.util.AttributeSet
 import android.view.View
@@ -12,9 +11,9 @@ import android.webkit.WebView
 class MathView : WebView {
 
     private val path: String = "file:///android_asset/"
-    private var text = " "
+    private var text = ""
     private var percentagesSize = 100
-    private var textAlign: String = TextAlign.CENTER.toString().toLowerCase()
+    private var textAlign: TextAlign = TextAlign.CENTER
     private var textColor: String = ""
     private var backgroundColor: String = ""
 
@@ -41,13 +40,8 @@ class MathView : WebView {
         update()
     }
 
-    fun setTextSizeBasedOnDpiDensity(percentages: Int) {
-        percentagesSize = percentages
-        setInitialScale((resources.displayMetrics.densityDpi) / 100 * percentagesSize)
-    }
-
     fun setTextAlign(textAlign: TextAlign) {
-        this.textAlign = textAlign.toString().toLowerCase()
+        this.textAlign = textAlign
         update()
     }
 
@@ -61,17 +55,26 @@ class MathView : WebView {
         update()
     }
 
+    fun setTextZoom(percentages: Int) {
+        percentagesSize = percentages
+        setInitialScale((resources.displayMetrics.densityDpi) / 100 * percentagesSize)
+    }
+
     fun getText(): String = text
+    fun getTextColor(): String = textColor
+    fun getBackgroundColor(): String = backgroundColor
+    fun getTextAlign(): TextAlign = textAlign
+
 
     private fun update() = loadDataWithBaseURL(path,
             "<html><head><link rel='stylesheet' href='" + path + "jqmath-0.4.3.css'>" +
                     "<script src='" + path + "jquery-1.4.3.min.js'></script>" +
                     "<script src='" + path + "jqmath-etc-0.4.5.min.js'></script>" +
-            "</head><body><script>var s = '$text';" +
-            "M.parseMath(s);document.body.style.color = \"$textColor\";" +
+                    "</head><body><script>var s = '$text';" +
+                    "M.parseMath(s);document.body.style.color = \"$textColor\";" +
                     "document.body.style.background = \"$backgroundColor\";" +
-            "document.body.style.textAlign = \"$textAlign\";" +
-            "document.write(s);</script></body>",
+                    "document.body.style.textAlign = \"${textAlign.toString().toLowerCase()}\";" +
+                    "document.write(s);</script></body>",
             "text/html", "UTF-8", null)
 }
 
