Factored out WidgetAnswerTextView

Author: grzesiek2010

collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyComponent.java

@@ -75,6 +75,7 @@
 import org.odk.collect.android.utilities.SavepointsRepositoryProvider;
 import org.odk.collect.android.utilities.ThemeUtils;
 import org.odk.collect.android.widgets.QuestionWidget;
+import org.odk.collect.android.widgets.WidgetAnswerTextView;
 import org.odk.collect.android.widgets.items.SelectOneFromMapDialogFragment;
 import org.odk.collect.async.Scheduler;
 import org.odk.collect.async.network.NetworkStateProvider;
@@ -257,6 +258,8 @@ interface Builder {
 
     void inject(FormHierarchyFragmentHostActivity formHierarchyFragmentHostActivity);
 
+    void inject(WidgetAnswerTextView widgetAnswerText);
+
     OpenRosaHttpInterface openRosaHttpInterface();
 
     ReferenceManager referenceManager();

collect_app/src/main/java/org/odk/collect/android/widgets/ArbitraryFileWidget.kt

@@ -51,7 +51,6 @@ class ArbitraryFileWidget(
         } else {
             binding.answerViewContainer.visibility = GONE
         }
-        widgetAnswer.setTextSize(answerFontSize.toFloat())
         binding.answerViewContainer.addView(widgetAnswer)
 
         return binding.root

collect_app/src/main/java/org/odk/collect/android/widgets/ArbitraryFileWidgetAnswer.kt

@@ -1,7 +1,6 @@
 package org.odk.collect.android.widgets
 
 import android.content.Context
-import android.util.TypedValue
 import android.view.LayoutInflater
 import org.odk.collect.android.databinding.ArbitraryFileWidgetAnswerBinding
 
@@ -15,8 +14,4 @@ class ArbitraryFileWidgetAnswer(context: Context) : WidgetAnswer(context) {
     override fun getAnswer(): String {
         return binding.answer.text.toString()
     }
-
-    override fun setTextSize(textSize: Float) {
-        binding.answer.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize)
-    }
 }

collect_app/src/main/java/org/odk/collect/android/widgets/BarcodeWidget.kt

@@ -49,7 +49,6 @@ class BarcodeWidget(
             binding.barcodeButton.text = getContext().getString(R.string.replace_barcode)
         }
         widgetAnswer.setAnswer(answer)
-        widgetAnswer.setTextSize(answerFontSize.toFloat())
         binding.answerViewContainer.addView(widgetAnswer)
         updateAnswerVisibility()
 

collect_app/src/main/java/org/odk/collect/android/widgets/BarcodeWidgetAnswer.kt

@@ -1,7 +1,6 @@
 package org.odk.collect.android.widgets
 
 import android.content.Context
-import android.util.TypedValue
 import android.view.LayoutInflater
 import org.odk.collect.android.databinding.BarcodeWidgetAnswerBinding
 
@@ -16,10 +15,6 @@ class BarcodeWidgetAnswer(context: Context) : WidgetAnswer(context) {
         return binding.answer.text.toString()
     }
 
-    override fun setTextSize(textSize: Float) {
-        binding.answer.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize)
-    }
-
     // Remove control characters, invisible characters and unused code points.
     private fun stripInvalidCharacters(data: String?): String? {
         return data?.replace("\\p{C}".toRegex(), "")

collect_app/src/main/java/org/odk/collect/android/widgets/ExArbitraryFileWidget.kt

@@ -54,7 +54,6 @@ class ExArbitraryFileWidget(
         } else {
             binding.answerViewContainer.visibility = GONE
         }
-        widgetAnswer.setTextSize(answerFontSize.toFloat())
         binding.answerViewContainer.addView(widgetAnswer)
 
         return binding.root

collect_app/src/main/java/org/odk/collect/android/widgets/WidgetAnswer.kt

@@ -7,6 +7,4 @@ abstract class WidgetAnswer(context: Context) : FrameLayout(context) {
     abstract fun setAnswer(answer: String?)
 
     abstract fun getAnswer(): String
-
-    abstract fun setTextSize(textSize: Float)
 }

collect_app/src/main/java/org/odk/collect/android/widgets/WidgetAnswerTextView.kt

@@ -0,0 +1,30 @@
+package org.odk.collect.android.widgets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.util.TypedValue
+import com.google.android.material.textview.MaterialTextView
+import org.odk.collect.android.R
+import org.odk.collect.android.injection.DaggerUtils
+import org.odk.collect.android.widgets.utilities.QuestionFontSizeUtils
+import org.odk.collect.settings.SettingsProvider
+import javax.inject.Inject
+
+class WidgetAnswerTextView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : MaterialTextView(context, attrs, R.attr.widgetAnswerTextViewStyle) {
+
+    @Inject
+    lateinit var settingsProvider: SettingsProvider
+
+    init {
+        DaggerUtils.getComponent(context).inject(this)
+
+        val textSize = QuestionFontSizeUtils.getFontSize(
+            settingsProvider.getUnprotectedSettings(),
+            QuestionFontSizeUtils.FontSize.HEADLINE_6
+        )
+        setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize.toFloat())
+    }
+}

collect_app/src/main/res/layout/arbitrary_file_widget_answer.xml

@@ -15,9 +15,8 @@
         app:layout_constraintBottom_toBottomOf="@id/answer"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <com.google.android.material.textview.MaterialTextView
+    <org.odk.collect.android.widgets.WidgetAnswerTextView
         android:id="@+id/answer"
-        style="@style/Widget.Collect.TextView.WidgetAnswer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"

collect_app/src/main/res/layout/barcode_widget_answer.xml

@@ -15,9 +15,8 @@
         app:layout_constraintBottom_toBottomOf="@id/answer"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <com.google.android.material.textview.MaterialTextView
+    <org.odk.collect.android.widgets.WidgetAnswerTextView
         android:id="@+id/answer"
-        style="@style/Widget.Collect.TextView.WidgetAnswer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"

collect_app/src/main/res/values/attrs.xml

@@ -19,5 +19,6 @@
 
     <declare-styleable name="CollectCustomAttributes">
         <attr name="widgetButtonIconQuestionWidgetStyle" format="reference" />
+        <attr name="widgetAnswerTextViewStyle" format="reference" />
     </declare-styleable>
 </resources>

collect_app/src/main/res/values/theme.xml

@@ -104,6 +104,7 @@
 
         <!-- Custom style for buttons used in question widgets -->
         <item name="widgetButtonIconQuestionWidgetStyle">@style/Widget.Collect.Button.Icon.QuestionWidget</item>
+        <item name="widgetAnswerTextViewStyle">@style/Widget.Collect.TextView.WidgetAnswer</item>
 
         <!-- Custom theme text appearance for larger buttons -->
         <item name="textAppearanceLabelExtraLarge">@style/TextAppearance.Collect.LabelExtraLarge</item>