diff --git a/app/src/main/java/com/dano/test1/HandlerDateSpinner.kt b/app/src/main/java/com/dano/test1/HandlerDateSpinner.kt index db34a78..5f84c14 100644 --- a/app/src/main/java/com/dano/test1/HandlerDateSpinner.kt +++ b/app/src/main/java/com/dano/test1/HandlerDateSpinner.kt @@ -2,10 +2,12 @@ package com.dano.test1 import android.content.Context import android.view.View +import android.view.ViewGroup import android.widget.* import kotlinx.coroutines.* import java.text.SimpleDateFormat import java.util.* +import android.util.TypedValue class HandlerDateSpinner( private val context: Context, @@ -186,7 +188,19 @@ class HandlerDateSpinner( } private fun setupSpinner(spinner: Spinner, items: List, defaultSelection: T?) { - val adapter = ArrayAdapter(context, android.R.layout.simple_spinner_item, items) + val adapter = object : ArrayAdapter(context, android.R.layout.simple_spinner_item, items) { + override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { + val v = super.getView(position, convertView, parent) as TextView + v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30f) + return v + } + + override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View { + val v = super.getDropDownView(position, convertView, parent) as TextView + v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30f) + return v + } + } adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) spinner.adapter = adapter diff --git a/app/src/main/java/com/dano/test1/HandlerMultiCheckboxQuestion.kt b/app/src/main/java/com/dano/test1/HandlerMultiCheckboxQuestion.kt index bcbb792..c24560a 100644 --- a/app/src/main/java/com/dano/test1/HandlerMultiCheckboxQuestion.kt +++ b/app/src/main/java/com/dano/test1/HandlerMultiCheckboxQuestion.kt @@ -4,6 +4,7 @@ import android.content.Context import android.view.View import android.widget.* import kotlinx.coroutines.* +import android.util.TypedValue class HandlerMultiCheckboxQuestion( private val context: Context, @@ -42,6 +43,10 @@ class HandlerMultiCheckboxQuestion( text = LanguageManager.getText(languageID, option.key) tag = option.key isChecked = selectedKeys.contains(option.key) + + // >>> Textgröße jeder Checkbox auf 30sp setzen <<< + setTextSize(TypedValue.COMPLEX_UNIT_SP, 30f) + layoutParams = LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT diff --git a/app/src/main/java/com/dano/test1/HandlerRadioQuestion.kt b/app/src/main/java/com/dano/test1/HandlerRadioQuestion.kt index 31be16b..81557ca 100644 --- a/app/src/main/java/com/dano/test1/HandlerRadioQuestion.kt +++ b/app/src/main/java/com/dano/test1/HandlerRadioQuestion.kt @@ -5,6 +5,7 @@ import android.view.View import android.text.Html import android.widget.* import kotlinx.coroutines.* +import android.util.TypedValue class HandlerRadioQuestion( private val context: Context, @@ -40,6 +41,10 @@ class HandlerRadioQuestion( val radioButton = RadioButton(context).apply { text = LanguageManager.getText(languageID, option.key) tag = option.key + // >>> Schriftgröße 30sp <<< + setTextSize(TypedValue.COMPLEX_UNIT_SP, 30f) + + // >>> Breite fast so breit wie RadioGroup (MATCH_PARENT) <<< layoutParams = RadioGroup.LayoutParams( RadioGroup.LayoutParams.MATCH_PARENT, RadioGroup.LayoutParams.WRAP_CONTENT @@ -48,6 +53,10 @@ class HandlerRadioQuestion( val margin = (16 * scale + 0.5f).toInt() setMargins(0, 0, 0, margin) } + + // >>> Innenabstand (Padding), damit Text nicht direkt am Rand klebt <<< + val padding = (12 * resources.displayMetrics.density).toInt() + setPadding(padding, padding, padding, padding) } radioGroup.addView(radioButton) } diff --git a/app/src/main/java/com/dano/test1/HandlerStringSpinner.kt b/app/src/main/java/com/dano/test1/HandlerStringSpinner.kt index 9efbd79..4f4bbb0 100644 --- a/app/src/main/java/com/dano/test1/HandlerStringSpinner.kt +++ b/app/src/main/java/com/dano/test1/HandlerStringSpinner.kt @@ -2,8 +2,11 @@ package com.dano.test1 import android.content.Context import android.view.View +import android.view.ViewGroup import android.widget.* import kotlinx.coroutines.* +import android.util.TypedValue +import android.widget.TextView class HandlerStringSpinner( private val context: Context, @@ -113,7 +116,20 @@ class HandlerStringSpinner( } private fun setupSpinner(spinner: Spinner, items: List, selectedItem: T?) { - val adapter = ArrayAdapter(context, android.R.layout.simple_spinner_item, items) + // Adapter, der Textgröße für ausgewähltes Element + Dropdown auf 30sp setzt + val adapter = object : ArrayAdapter(context, android.R.layout.simple_spinner_item, items) { + override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { + val v = super.getView(position, convertView, parent) as TextView + v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30f) + return v + } + + override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View { + val v = super.getDropDownView(position, convertView, parent) as TextView + v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30f) + return v + } + } adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) spinner.adapter = adapter diff --git a/app/src/main/java/com/dano/test1/HandlerValueSpinner.kt b/app/src/main/java/com/dano/test1/HandlerValueSpinner.kt index 8431d82..f6e6b93 100644 --- a/app/src/main/java/com/dano/test1/HandlerValueSpinner.kt +++ b/app/src/main/java/com/dano/test1/HandlerValueSpinner.kt @@ -2,8 +2,10 @@ package com.dano.test1 import android.content.Context import android.view.View +import android.view.ViewGroup import android.widget.* import kotlinx.coroutines.* +import android.util.TypedValue class HandlerValueSpinner( private val context: Context, @@ -112,7 +114,19 @@ class HandlerValueSpinner( } private fun setupSpinner(spinner: Spinner, items: List, selectedItem: T?) { - val adapter = ArrayAdapter(context, android.R.layout.simple_spinner_item, items) + val adapter = object : ArrayAdapter(context, android.R.layout.simple_spinner_item, items) { + override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { + val v = super.getView(position, convertView, parent) as TextView + v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30f) + return v + } + + override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View { + val v = super.getDropDownView(position, convertView, parent) as TextView + v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30f) + return v + } + } adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) spinner.adapter = adapter diff --git a/app/src/main/res/layout/client_coach_code_question.xml b/app/src/main/res/layout/client_coach_code_question.xml index ffd18d3..3ec53b9 100644 --- a/app/src/main/res/layout/client_coach_code_question.xml +++ b/app/src/main/res/layout/client_coach_code_question.xml @@ -12,8 +12,9 @@