erik/TESRemoteProgrammer
erik/TESRemoteProgrammer
1
0
Fork 0
Code Issues Pull requests Releases Activity

Added fromHtml extension function.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-09-27 21:53:36 -07:00
parent 1e641f8d14
commit 4dbf99ec39
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
View file

@ -26,7 +26,6 @@ import android.content.Intent
import android.graphics.Typeface import android.graphics.Typeface
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import android.support.v7.app.AppCompatActivity
import android.text.Html
import android.text.InputFilter import android.text.InputFilter
import android.text.InputType import android.text.InputType
import android.text.TextUtils import android.text.TextUtils
@ -43,6 +42,7 @@ import com.google.gson.JsonSyntaxException
import net.thauvin.erik.android.tesremoteprogrammer.models.Config import net.thauvin.erik.android.tesremoteprogrammer.models.Config
import net.thauvin.erik.android.tesremoteprogrammer.models.Configurations import net.thauvin.erik.android.tesremoteprogrammer.models.Configurations
import net.thauvin.erik.android.tesremoteprogrammer.util.Dtmf import net.thauvin.erik.android.tesremoteprogrammer.util.Dtmf
import net.thauvin.erik.android.tesremoteprogrammer.util.fromHtml
import net.thauvin.erik.android.tesremoteprogrammer.util.isDKS import net.thauvin.erik.android.tesremoteprogrammer.util.isDKS
import net.thauvin.erik.android.tesremoteprogrammer.util.isDigits import net.thauvin.erik.android.tesremoteprogrammer.util.isDigits
import org.jetbrains.anko.AnkoLogger import org.jetbrains.anko.AnkoLogger
@ -92,8 +92,6 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
const val QUOTE = "'" const val QUOTE = "'"
} }
private fun fromHtml(s: String) = Html.fromHtml(s, Html.FROM_HTML_MODE_LEGACY)
private fun initConfigurations() { private fun initConfigurations() {
try { try {
ObjectInputStream(openFileInput(currentConfigData)).use { ObjectInputStream(openFileInput(currentConfigData)).use {
@ -113,7 +111,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
if (validateConfig(config, errors)) { if (validateConfig(config, errors)) {
info(">>> ${config.params.name}: successfully loaded") info(">>> ${config.params.name}: successfully loaded")
} else { } else {
info(">>> ${config.params.name}: " + fromHtml(errors.toString())) info(">>> ${config.params.name}: " + errors.toString().fromHtml())
} }
} }
@ -153,7 +151,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
if (errors.isNotEmpty()) { if (errors.isNotEmpty()) {
alert { alert {
title = getString(R.string.alert_config_error) title = getString(R.string.alert_config_error)
message = fromHtml("$errors") message = errors.toString().fromHtml()
cancelButton { } cancelButton { }
}.show() }.show()
} }

4
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt
View file

@ -17,8 +17,12 @@
*/ */
package net.thauvin.erik.android.tesremoteprogrammer.util package net.thauvin.erik.android.tesremoteprogrammer.util
import android.text.Html
private val digitPattern = Regex("[0-9]+") private val digitPattern = Regex("[0-9]+")
fun String.fromHtml() = Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY)
fun String.isDigits() = isNotBlank() && matches(digitPattern) fun String.isDigits() = isNotBlank() && matches(digitPattern)
fun String.isDKS(): Boolean = equals(Dtmf.DKS, true) fun String.isDKS(): Boolean = equals(Dtmf.DKS, true)