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

Optimization.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-08-22 21:36:20 -07:00
parent 880b49c1b3
commit ee41200258
9 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,12 +43,8 @@ class StepsActivity : FragmentActivity() {
steps: ArrayList<String>) : FragmentStatePagerAdapter(fm) {
private val steps = ArrayList<String>(steps)
override fun getItem(position: Int): Fragment {
return StepsFragment.create(position, steps)
}
override fun getItem(position: Int): Fragment = StepsFragment.create(position, steps)
override fun getCount(): Int {
return steps.size
}
override fun getCount(): Int = steps.size
}
}

5
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/StepsFragment.kt
View file

@ -52,9 +52,8 @@ class StepsFragment : Fragment() {
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_steps, container, false) as ViewGroup
}
savedInstanceState: Bundle?): View? =
inflater.inflate(R.layout.fragment_steps, container, false) as ViewGroup
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

2
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/AlphaFilter.kt
View file

@ -39,7 +39,7 @@ class AlphaFilter(private val extras: String) : InputFilter {
return source
} else {
val sb = StringBuilder()
(start..end - 1)
(start until end)
.map { source[it] }
.filter { it.isLetterOrDigit() || extras.contains(it) }
.forEach { sb.append(it) }

4
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/MinMaxFilter.kt
View file

@ -39,10 +39,10 @@ class MinMaxFilter(private val min: Int, private val max: Int, private val size:
if (zeros) {
if (size > 1 && len != size) {
if (i == 0) {
i = if (i == 0) {
return true
} else {
i = s.padEnd(size, '0').toInt()
s.padEnd(size, '0').toInt()
}
}
} else {

2
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/NumberFilter.kt
View file

@ -44,7 +44,7 @@ class NumberFilter(allowed: String, alt: String) : InputFilter, AnkoLogger {
return source
} else {
val sb = StringBuilder()
(start..end - 1)
(start until end)
.map { source[it] }
.filter { allowed.contains(it) }
.forEach { sb.append(it.toUpperCase()) }

4
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Config.kt
View file

@ -37,9 +37,7 @@ data class Config(var params: Params, var opts: List<Option>) : Parcelable, Seri
source.readParcelable<Params>(Params::class.java.classLoader),
source.createTypedArrayList(Option.CREATOR))
override fun compareTo(other: Config): Int {
return params.name.compareTo(other.params.name)
}
override fun compareTo(other: Config): Int = params.name.compareTo(other.params.name)
override fun describeContents() = 0

4
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
View file

@ -45,9 +45,7 @@ data class Option(var title: String,
1 == source.readInt(),
source.readString())
override fun compareTo(other: Option): Int {
return title.compareTo(other.title)
}
override fun compareTo(other: Option): Int = title.compareTo(other.title)
override fun describeContents() = 0

7
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Dtmf.kt
View file

@ -87,9 +87,7 @@ class Dtmf {
return result.toString()
}
fun isValidType(type: String): Boolean {
return type.equals(DKS, true) || type.equals(LINEAR, true)
}
fun isValidType(type: String): Boolean = type.equals(DKS, true) || type.equals(LINEAR, true)
private fun linearAlphaToDigits(text: String): String {
@ -189,8 +187,7 @@ class Dtmf {
fun mock(option: Option, blank: String): String {
val replace = arrayListOf(Pair(DTMF_MASTER, blank))
@Suppress("UNUSED_PARAMETER")
option.fields.forEachIndexed { i, field ->
option.fields.forEachIndexed { i, _ ->
replace.add(Pair(DTMF_FIELD.format(i + 1), blank))
}

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

@ -31,13 +31,9 @@ fun String.isDigits(): Boolean {
return true
}
fun String.isDKS(): Boolean {
return equals(Dtmf.DKS, true)
}
fun String.isDKS(): Boolean = equals(Dtmf.DKS, true)
fun String.isLinear(): Boolean {
return equals(Dtmf.LINEAR, true)
}
fun String.isLinear(): Boolean = equals(Dtmf.LINEAR, true)
fun String.replaceAll(replace: Array<Pair<String, String>>): String {
val result = StringBuilder(this)