Removed auto resize textview.

This commit is contained in:
Erik C. Thauvin 2019-09-26 15:27:05 -07:00
parent d263af94f2
commit 23d2953c6b
2 changed files with 38 additions and 40 deletions

View file

@ -35,11 +35,9 @@ import android.util.TypedValue
import android.view.Gravity.BOTTOM import android.view.Gravity.BOTTOM
import android.view.Gravity.END import android.view.Gravity.END
import android.view.Gravity.START import android.view.Gravity.START
import android.view.ViewManager
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import android.widget.EditText import android.widget.EditText
import com.lb.auto_fit_textview.AutoResizeTextView
import net.thauvin.erik.android.tesremoteprogrammer.filters.AlphaFilter import net.thauvin.erik.android.tesremoteprogrammer.filters.AlphaFilter
import net.thauvin.erik.android.tesremoteprogrammer.filters.MinMaxFilter import net.thauvin.erik.android.tesremoteprogrammer.filters.MinMaxFilter
import net.thauvin.erik.android.tesremoteprogrammer.filters.NumberFilter import net.thauvin.erik.android.tesremoteprogrammer.filters.NumberFilter
@ -51,7 +49,6 @@ import net.thauvin.erik.android.tesremoteprogrammer.util.isLinear
import net.thauvin.erik.android.tesremoteprogrammer.util.toDialPad import net.thauvin.erik.android.tesremoteprogrammer.util.toDialPad
import org.jetbrains.anko.AnkoLogger import org.jetbrains.anko.AnkoLogger
import org.jetbrains.anko.bottomPadding import org.jetbrains.anko.bottomPadding
import org.jetbrains.anko.custom.ankoView
import org.jetbrains.anko.design.coordinatorLayout import org.jetbrains.anko.design.coordinatorLayout
import org.jetbrains.anko.design.floatingActionButton import org.jetbrains.anko.design.floatingActionButton
import org.jetbrains.anko.design.textInputEditText import org.jetbrains.anko.design.textInputEditText
@ -63,9 +60,9 @@ import org.jetbrains.anko.info
import org.jetbrains.anko.makeCall import org.jetbrains.anko.makeCall
import org.jetbrains.anko.matchParent import org.jetbrains.anko.matchParent
import org.jetbrains.anko.padding import org.jetbrains.anko.padding
import org.jetbrains.anko.singleLine
import org.jetbrains.anko.startActivity import org.jetbrains.anko.startActivity
import org.jetbrains.anko.support.v4.nestedScrollView import org.jetbrains.anko.support.v4.nestedScrollView
import org.jetbrains.anko.textView
import org.jetbrains.anko.topPadding import org.jetbrains.anko.topPadding
import org.jetbrains.anko.verticalLayout import org.jetbrains.anko.verticalLayout
import org.jetbrains.anko.wrapContent import org.jetbrains.anko.wrapContent
@ -77,8 +74,6 @@ import java.util.ArrayList
class ProgrammingActivity : AppCompatActivity(), AnkoLogger { class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
private val empty = "" private val empty = ""
private inline fun ViewManager.autofitTextView(theme: Int = 0, init: AutoResizeTextView.() -> Unit) = ankoView(::AutoResizeTextView, theme, init)
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -88,12 +83,11 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
coordinatorLayout { coordinatorLayout {
// option title // option title
autofitTextView { textView {
padding = dip(20) padding = dip(20)
text = option.title text = option.title
setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20f) setTextSize(TypedValue.COMPLEX_UNIT_DIP, 24f)
singleLine = true maxLines = 2
maxLines = 1
typeface = Typeface.DEFAULT_BOLD typeface = Typeface.DEFAULT_BOLD
isFocusableInTouchMode = true isFocusableInTouchMode = true
ellipsize = TextUtils.TruncateAt.END ellipsize = TextUtils.TruncateAt.END
@ -110,8 +104,9 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
// fields // fields
if (option.fields.isEmpty()) { if (option.fields.isEmpty()) {
// no configurations // no configurations
autofitTextView { textView {
text = getString(R.string.no_conf_req) text = getString(R.string.no_conf_req)
setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20f)
typeface = Typeface.create(Typeface.DEFAULT, Typeface.ITALIC) typeface = Typeface.create(Typeface.DEFAULT, Typeface.ITALIC)
freezesText = true freezesText = true
}.lparams(width = matchParent, height = matchParent) }.lparams(width = matchParent, height = matchParent)

View file

@ -1,38 +1,41 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content" android:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fillViewport="true"> android:fillViewport="true">
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp"
android:weightSum="1">
<TextView
android:id="@+id/frag_steps_title"
style="?android:textAppearanceLarge"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:orientation="vertical"
android:freezesText="true" android:padding="16dp"
android:textStyle="bold" /> android:weightSum="1">
<com.lb.auto_fit_textview.AutoResizeTextView <TextView
android:id="@+id/frag_steps" android:id="@+id/frag_steps_title"
style="?android:textAppearanceLarge" style="?android:textAppearanceLarge"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="0.8" android:layout_marginBottom="16dp"
android:freezesText="true" android:freezesText="true"
android:gravity="center" android:textStyle="bold" />
android:lineSpacingMultiplier="1.2"
android:maxLines="1" <TextView
android:text="" android:id="@+id/frag_steps"
android:textSize="78sp" /> style="?android:textAppearanceLarge"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.8"
android:autoSizeMaxTextSize="100sp"
android:autoSizeMinTextSize="12sp"
android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform"
android:freezesText="true"
android:gravity="center"
android:lineSpacingMultiplier="1.2"
android:maxLines="1"
android:text="" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>