Make text sizes and color overrideable

roedll · roedll · commit be466a444975 · 2021-03-11T18:54:35.000+01:00
diff --git a/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/DateTimePickerPart.kt b/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/DateTimePickerPart.kt
@@ -5,6 +5,7 @@ import android.app.TimePickerDialog
 import android.content.Context
 import android.os.Parcelable
 import android.util.AttributeSet
+import android.util.TypedValue
 import android.view.Gravity
 import android.widget.*
 import androidx.appcompat.widget.AppCompatTextView
@@ -91,7 +92,7 @@ internal class DateTimePickerPart @JvmOverloads constructor(
         }
         selectedDateTimeLabel = TextView(context).apply {
             text = "$selectedDate $selectedTime"
-            textSize = context.resources.getDimension(R.dimen.date_time_label_text_size)
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, context.resources.getDimension(R.dimen.date_time_label_text_size))
             setTextColor(ContextCompat.getColor(context, R.color.black))
             textAlignment = AppCompatTextView.TEXT_ALIGNMENT_CENTER
             gravity = Gravity.CENTER
diff --git a/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/InfoTextPart.kt b/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/InfoTextPart.kt
@@ -43,6 +43,7 @@ internal class InfoTextPart @JvmOverloads constructor(
             id = R.id.infoTextTitle
             setText(text)
             setTextSize(R.dimen.question_info_title_text_size)
+            setTextColor(ContextCompat.getColor(context, R.color.question_info_title_text))
             val horizontalPadding =
                 context.resources.getDimensionPixelSize(R.dimen.question_horizontal_padding)
             val verticalPadding =
@@ -56,6 +57,7 @@ internal class InfoTextPart @JvmOverloads constructor(
             id = R.id.infoTextInfo
             setText(text)
             setTextSize(R.dimen.question_info_text_text_size)
+            setTextColor(ContextCompat.getColor(context, R.color.question_info_text_text))
             val horizontalPadding =
                 context.resources.getDimensionPixelSize(R.dimen.question_horizontal_padding)
             val verticalPadding =
@@ -69,6 +71,7 @@ internal class InfoTextPart @JvmOverloads constructor(
             id = R.id.infoTextQuestion
             setText(text)
             setTextSize(R.dimen.question_text_size)
+            setTextColor(ContextCompat.getColor(context, R.color.question_text))
             val horizontalPadding =
                 context.resources.getDimensionPixelSize(R.dimen.question_horizontal_padding)
             val verticalPadding =
diff --git a/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/MultipleChoicePart.kt b/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/MultipleChoicePart.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Handler
 import android.util.AttributeSet
+import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -43,7 +44,7 @@ internal class MultipleChoicePart @JvmOverloads constructor(
         }
 
     @ColorInt
-    var defaultColor: Int = ContextCompat.getColor(context, R.color.survey_text)
+    var defaultColor: Int = ContextCompat.getColor(context, R.color.question_text)
         set(color) {
             update(options)
             field = color
@@ -132,6 +133,7 @@ internal class MultipleChoicePart @JvmOverloads constructor(
         val horizontalPaddingEditTextRight = context.px(
             context.resources.getDimension(R.dimen.text_field_horizontal_padding_right)
         ).toInt()
+        val textSizeEditText = context.resources.getDimension(R.dimen.text_field_text_size)
 
         val checkBox = CheckBox(context).apply {
             id = View.generateViewId()
@@ -140,7 +142,9 @@ internal class MultipleChoicePart @JvmOverloads constructor(
             isFocusable = true
             isClickable = true
             buttonDrawable = null
-            textSize = 20f
+
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, textSizeEditText)
+            setTextColor(ContextCompat.getColor(context, R.color.question_text))
 
             background = createSelectableThemedBackground(context, border, themeColor)
 
@@ -153,11 +157,10 @@ internal class MultipleChoicePart @JvmOverloads constructor(
                 verticalPaddingEditText
             )
 
-            val layoutParams = LayoutParams(
+            this.layoutParams = LayoutParams(
                 LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT
             )
-            this.layoutParams = layoutParams
         }
 
         Handler().post {
diff --git a/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/ScalePart.kt b/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/ScalePart.kt
@@ -166,19 +166,19 @@ internal class ScalePart @JvmOverloads constructor(
             minimumValueDescriptionField = TextView(context).setRandomViewId().apply {
                 this.textAlignment = View.TEXT_ALIGNMENT_CENTER
                 this.setTextSize(TypedValue.COMPLEX_UNIT_PX, descriptionTextSize)
-                this.setTextColor(ContextCompat.getColor(context, R.color.survey_text));
+                this.setTextColor(ContextCompat.getColor(context, R.color.scale_part_description_text));
                 this.setPadding(textPadding, textPadding, textPadding, 0)
             }
             maximumValueDescriptionField = TextView(context).setRandomViewId().apply {
                 this.textAlignment = View.TEXT_ALIGNMENT_CENTER
                 this.setTextSize(TypedValue.COMPLEX_UNIT_PX, descriptionTextSize)
-                this.setTextColor(ContextCompat.getColor(context, R.color.survey_text));
+                this.setTextColor(ContextCompat.getColor(context, R.color.scale_part_description_text));
                 this.setPadding(textPadding, textPadding, textPadding, 0)
             }
             currentValueDescriptionField = TextView(context).setRandomViewId().apply {
                 this.textAlignment = View.TEXT_ALIGNMENT_CENTER
                 this.setTextSize(TypedValue.COMPLEX_UNIT_PX, selectedTextSize)
-                this.setTextColor(ContextCompat.getColor(context, R.color.survey_text));
+                this.setTextColor(ContextCompat.getColor(context, R.color.scale_part_selected_text));
                 this.setPadding(textPadding, textPadding, textPadding, 0)
             }
             seekBar = AppCompatSeekBar(context).apply {
diff --git a/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/SingleChoicePart.kt b/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/SingleChoicePart.kt
@@ -44,7 +44,7 @@ internal class SingleChoicePart @JvmOverloads constructor(
         }
 
     @ColorInt
-    var defaultColor: Int = ContextCompat.getColor(context, R.color.survey_text)
+    var defaultColor: Int = ContextCompat.getColor(context, R.color.question_text)
     set(color) {
         update(options)
         field = color
diff --git a/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/TextFieldPart.kt b/survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/question_parts/TextFieldPart.kt
@@ -3,6 +3,7 @@ package com.quickbirdstudios.surveykit.backend.views.question_parts
 import android.content.Context
 import android.text.InputType
 import android.util.AttributeSet
+import android.util.TypedValue
 import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.LinearLayout
@@ -29,6 +30,7 @@ internal open class TextFieldPart @JvmOverloads constructor(
         val horizontalPaddingEditText = context.px(
             context.resources.getDimension(R.dimen.text_field_horizontal_padding_left)
         ).toInt()
+        val textSizeEditText = context.resources.getDimension(R.dimen.text_field_text_size)
 
         field = EditText(context).apply {
             id = R.id.textFieldPartField
@@ -38,6 +40,9 @@ internal open class TextFieldPart @JvmOverloads constructor(
             isClickable = true
             background = null
 
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, textSizeEditText)
+            setTextColor(ContextCompat.getColor(context, R.color.question_text))
+
             setHintTextColor(ContextCompat.getColor(context, R.color.hint_grey))
 
             setPadding(
@@ -47,13 +52,10 @@ internal open class TextFieldPart @JvmOverloads constructor(
                 verticalPaddingEditText
             )
 
-            setTextColor(ContextCompat.getColor(context, R.color.survey_text))
-
-            val layoutParams = LayoutParams(
+            this.layoutParams = LayoutParams(
                 LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT
             )
-            this.layoutParams = layoutParams
         }
 
         this.background = context.resources.getDrawable(R.drawable.input_border, null)
diff --git a/survey/src/main/res/layout/layout_question.xml b/survey/src/main/res/layout/layout_question.xml
@@ -10,10 +10,10 @@
         android:id="@+id/question"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="@dimen/question_vertical_margin"
         android:textAlignment="center"
-        android:textColor="@color/survey_text"
-        android:textSize="28sp"
+        android:textColor="@color/question_text"
+        android:textSize="@dimen/question_text_size"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/survey/src/main/res/values/colors.xml b/survey/src/main/res/values/colors.xml
@@ -21,4 +21,17 @@
     <color name="color_accent">#36BFCC</color>
 
     <color name="survey_text">#000000</color>
+
+    <color name="question_info_title_text">@color/survey_text</color>
+    <color name="question_info_text_text">@color/survey_text</color>
+    <color name="question_text">@color/survey_text</color>
+    <color name="question_text_selected">@color/color_accent</color>
+    <color name="scale_part_description_text">@color/survey_text</color>
+    <color name="scale_part_selected_text">@color/survey_text</color>
+    <!--color name="question_info_title_text">@android:color/holo_red_light</color>
+    <color name="question_info_text_text">@android:color/holo_green_light</color>
+    <color name="question_text">@android:color/holo_blue_light</color>
+    <color name="question_text_selected">@android:color/holo_green_light</color>
+    <color name="scale_part_description_text">@android:color/holo_red_light</color>
+    <color name="scale_part_selected_text">@android:color/holo_green_light</color-->
 </resources>
diff --git a/survey/src/main/res/values/dimens.xml b/survey/src/main/res/values/dimens.xml
@@ -4,6 +4,7 @@
     <dimen name="question_text_padding">8dp</dimen>
     <dimen name="question_vertical_padding">16dp</dimen>
     <dimen name="question_horizontal_padding">20dp</dimen>
+    <dimen name="question_vertical_margin">20dp</dimen>
 
     <dimen name="question_info_title_text_size">28sp</dimen>
     <dimen name="question_info_text_text_size">16sp</dimen>
@@ -20,11 +21,15 @@
     <dimen name="text_field_horizontal_padding_left">12dp</dimen>
     <dimen name="text_field_horizontal_padding_right">24dp</dimen>
     <dimen name="text_field_vertical_padding">6dp</dimen>
+    <dimen name="text_field_text_size">28sp</dimen>
 
     <dimen name="scale_part_description_text_size">20sp</dimen>
     <dimen name="scale_part_selected_text_size">32sp</dimen>
     <dimen name="scale_part_text_padding">4dp</dimen>
+
     <dimen name="image_selection_colored_border">4dp</dimen>
+
     <dimen name="date_time_label_text_size">14sp</dimen>
+
     <dimen name="search_drawable_padding">32dp</dimen>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ internal class SingleChoicePart @JvmOverloads constructor(`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@ColorInt`
`47`		`- var defaultColor: Int = ContextCompat.getColor(context, R.color.survey_text)`
	`47`	`+ var defaultColor: Int = ContextCompat.getColor(context, R.color.question_text)`
`48`	`48`	`set(color) {`
`49`	`49`	`update(options)`
`50`	`50`	`field = color`