reverted refactor change to function

.idea/deviceManager.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">

app/src/main/java/com/dano/test1/HandlerStringSpinner.kt

@@ -1,186 +0,0 @@
-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
-import androidx.core.widget.TextViewCompat
-
-class HandlerStringSpinner(
-    private val context: Context,
-    private val answers: MutableMap<String, Any>,
-    private val languageID: String,
-    private val goToNextQuestion: () -> Unit,
-    private val goToPreviousQuestion: () -> Unit,
-    private val showToast: (String) -> Unit,
-    private val questionnaireMeta: String // Meta, damit dieselbe DB-ID wie in anderen Handlern gebildet wird
-) : QuestionHandler {
-
-    private lateinit var layout: View
-    private lateinit var question: QuestionItem.StringSpinnerQuestion
-
-    override fun bind(layout: View, question: QuestionItem) {
-        if (question !is QuestionItem.StringSpinnerQuestion) return
-
-        this.layout = layout
-        this.question = question
-
-        val questionTextView = layout.findViewById<TextView>(R.id.question)
-        val textView = layout.findViewById<TextView>(R.id.textView)
-        val spinner = layout.findViewById<Spinner>(R.id.string_spinner)
-
-        // Texte setzen
-        questionTextView.text = question.question?.let { LanguageManager.getText(languageID, it) } ?: ""
-        textView.text = question.textKey?.let { LanguageManager.getText(languageID, it) } ?: ""
-
-        // === Textgrößen prozentual zur Bildschirmhöhe (wie im HandlerRadioQuestion) ===
-        setTextSizePercentOfScreenHeight(textView,         0.03f)
-        setTextSizePercentOfScreenHeight(questionTextView, 0.03f)
-        // ==============================================================================
-
-        val options = buildOptionsList()
-
-        // vorhandene Auswahl (falls vorhanden)
-        val savedSelection = question.question?.let { answers[it] as? String }
-
-        // Spinner aufsetzen (Schriftgröße & Zeilenhöhe dynamisch, kein Abschneiden)
-        setupSpinner(spinner, options, savedSelection)
-
-        // Falls noch keine Antwort im Map: aus DB laden (analog zu anderen Handlern)
-        val answerMapKey = question.question ?: (question.id ?: "")
-        if (answerMapKey.isNotBlank() && !answers.containsKey(answerMapKey)) {
-            CoroutineScope(Dispatchers.IO).launch {
-                try {
-                    val clientCode = GlobalValues.LAST_CLIENT_CODE
-                    if (clientCode.isNullOrBlank()) return@launch
-
-                    val allAnswersForClient = MyApp.database.answerDao().getAnswersForClient(clientCode)
-                    val myQuestionId = questionnaireMeta + "-" + question.question
-                    val dbAnswer = allAnswersForClient.find { it.questionId == myQuestionId }?.answerValue
-
-                    if (!dbAnswer.isNullOrBlank()) {
-                        withContext(Dispatchers.Main) {
-                            answers[answerMapKey] = dbAnswer
-                            val index = options.indexOf(dbAnswer)
-                            if (index >= 0) spinner.setSelection(index)
-                        }
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-            }
-        }
-
-        layout.findViewById<Button>(R.id.Qnext).setOnClickListener {
-            if (validate()) {
-                saveAnswer()
-                goToNextQuestion()
-            }
-        }
-
-        layout.findViewById<Button>(R.id.Qprev).setOnClickListener {
-            goToPreviousQuestion()
-        }
-    }
-
-    override fun validate(): Boolean {
-        val spinner = layout.findViewById<Spinner>(R.id.string_spinner)
-        val selected = spinner.selectedItem as? String
-        val prompt = LanguageManager.getText(languageID, "choose_answer")
-
-        return if (selected.isNullOrEmpty() || selected == prompt) {
-            showToast(LanguageManager.getText(languageID, "select_one_answer"))
-            false
-        } else {
-            true
-        }
-    }
-
-    override fun saveAnswer() {
-        val spinner = layout.findViewById<Spinner>(R.id.string_spinner)
-        val selected = spinner.selectedItem as? String ?: return
-        question.question?.let { key -> answers[key] = selected }
-    }
-
-    private fun buildOptionsList(): List<String> {
-        return if (question.id == "q11") {
-            Countries.getAllCountries(languageID)
-        } else {
-            val prompt = LanguageManager.getText(languageID, "choose_answer")
-            listOf(prompt) + question.options
-        }
-    }
-
-    // Textgröße prozentual zur Bildschirmhöhe setzen und AutoSize deaktivieren
-    private fun setTextSizePercentOfScreenHeight(view: TextView, percentOfHeight: Float) {
-        val dm = (view.context ?: layout.context).resources.displayMetrics
-        val sp = (dm.heightPixels * percentOfHeight) / dm.scaledDensity
-        TextViewCompat.setAutoSizeTextTypeWithDefaults(view, TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE)
-        view.setTextSize(TypedValue.COMPLEX_UNIT_SP, sp)
-    }
-
-    // Spinner-Adapter mit dynamischer Schrift & stabiler Dropdown-Zeilenhöhe (kein Abschneiden)
-    private fun <T> setupSpinner(spinner: Spinner, items: List<T>, selectedItem: T?) {
-        val dm = context.resources.displayMetrics
-
-        fun spFromScreenHeight(percent: Float): Float =
-            (dm.heightPixels * percent) / dm.scaledDensity
-        fun pxFromSp(sp: Float): Int = (sp * dm.scaledDensity).toInt()
-
-        // Schrift & abgeleitete Höhen (wie beim Value-Spinner-Fix)
-        val textSp    = spFromScreenHeight(0.0275f)            // ~2.75% der Bildschirmhöhe
-        val textPx    = pxFromSp(textSp)
-        val vPadPx    = (textPx * 0.50f).toInt()               // vertikales Padding
-        val rowHeight = (textPx * 2.20f + 2 * vPadPx).toInt()  // feste Zeilenhöhe, verhindert Abschneiden
-
-        val adapter = object : ArrayAdapter<T>(context, android.R.layout.simple_spinner_item, items) {
-            private fun styleRow(tv: TextView, forceHeight: Boolean) {
-                tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSp)
-                tv.includeFontPadding = true
-                tv.setLineSpacing(0f, 1.2f)
-                tv.gravity = (tv.gravity and android.view.Gravity.HORIZONTAL_GRAVITY_MASK) or android.view.Gravity.CENTER_VERTICAL
-                tv.setPadding(tv.paddingLeft, vPadPx, tv.paddingRight, vPadPx)
-                tv.minHeight = rowHeight
-                tv.isSingleLine = true
-                if (forceHeight) {
-                    val lp = tv.layoutParams
-                    if (lp == null || lp.height <= 0) {
-                        tv.layoutParams = AbsListView.LayoutParams(
-                            AbsListView.LayoutParams.MATCH_PARENT, rowHeight
-                        )
-                    } else {
-                        lp.height = rowHeight
-                    }
-                }
-            }
-
-            override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-                val v = super.getView(position, convertView, parent) as TextView
-                styleRow(v, forceHeight = false) // ausgewählte Ansicht
-                return v
-            }
-
-            override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
-                val v = super.getDropDownView(position, convertView, parent) as TextView
-                styleRow(v, forceHeight = true)  // Dropdown-Zeilen: Höhe erzwingen
-                return v
-            }
-        }
-
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        spinner.adapter = adapter
-
-        // Spinner selbst ausreichend hoch machen
-        spinner.setPadding(spinner.paddingLeft, vPadPx, spinner.paddingRight, vPadPx)
-        spinner.minimumHeight = rowHeight
-        spinner.requestLayout()
-
-        selectedItem?.let {
-            val index = items.indexOf(it)
-            if (index >= 0) spinner.setSelection(index)
-        }
-    }
-}

app/src/main/java/com/dano/test1/LoginManager.kt

@@ -1,61 +0,0 @@
-package com.dano.test1
-
-import android.content.Context
-import android.util.Log
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import org.json.JSONObject
-
-object LoginManager {
-    private const val SERVER_LOGIN_URL = "http://49.13.157.44/login.php"
-    private val client = OkHttpClient()
-
-    fun loginUserWithCredentials(
-        context: Context,
-        username: String,
-        password: String,
-        onSuccess: (String) -> Unit,
-        onError: (String) -> Unit
-    ) {
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                val bodyJson = JSONObject()
-                    .put("username", username)
-                    .put("password", password)
-                    .toString()
-                    .toRequestBody("application/json".toMediaType())
-
-                val request = Request.Builder()
-                    .url(SERVER_LOGIN_URL)
-                    .post(bodyJson)
-                    .build()
-
-                val response = client.newCall(request).execute()
-                val text = response.body?.string()
-
-                if (response.isSuccessful && text != null) {
-                    val json = JSONObject(text)
-                    if (json.optBoolean("success")) {
-                        val token = json.getString("token")
-                        // => setzt auch den Login-Timestamp:
-                        TokenStore.save(context, token, username)
-                        withContext(Dispatchers.Main) { onSuccess(token) }
-                    } else {
-                        withContext(Dispatchers.Main) { onError("Login fehlgeschlagen") }
-                    }
-                } else {
-                    withContext(Dispatchers.Main) { onError("Fehler beim Login (${response.code})") }
-                }
-            } catch (e: Exception) {
-                Log.e("LOGIN", "Exception", e)
-                withContext(Dispatchers.Main) { onError("Exception: ${e.message}") }
-            }
-        }
-    }
-}

app/src/main/java/com/dano/test1/MainActivity.kt

@@ -13,7 +13,11 @@ import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import java.io.File
+import com.dano.test1.network.DatabaseDownloader
+import com.dano.test1.network.LoginManager
+import com.dano.test1.network.TokenStore
+import com.dano.test1.questionnaire.QuestionnaireBase
+import com.dano.test1.ui.HandlerOpeningScreen
 
 class MainActivity : AppCompatActivity() {
 

app/src/main/java/com/dano/test1/MyApp.kt

@@ -6,6 +6,19 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import com.dano.test1.data.AppDatabase
 
+/*
+MyApp (Application)
+ - Einstiegspunkt der App, der einmal pro Prozessstart initialisiert wird.
+
+Besonderheiten der DB-Konfiguration:
+ - Name: "questionnaire_database"
+ - fallbackToDestructiveMigration():
+     * Falls sich das Schema ändert und keine Migration vorliegt,wird die DB zerstört und neu angelegt.
+ - setJournalMode(TRUNCATE):
+     * Verwendet TRUNCATE-Journal (keine separaten -wal/-shm Dateien), es existiert nur die Hauptdatei „questionnaire_database“.
+ - Callback onOpen():
+     * Loggt beim Öffnen der Datenbank einen Hinweis.
+*/
 class MyApp : Application() {
 
     companion object {
@@ -16,7 +29,7 @@ class MyApp : Application() {
     override fun onCreate() {
         super.onCreate()
 
-        // Room Datenbank bauen: nur die Hauptdatei, ohne WAL und Journal
+        // Room-Datenbank bauen: nur die Hauptdatei, ohne WAL und Journal
         database = Room.databaseBuilder(
             applicationContext,
             AppDatabase::class.java,

app/src/main/java/com/dano/test1/NetworkUtilis.kt

@@ -1,19 +0,0 @@
-package com.dano.test1
-
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
-
-object NetworkUtils {
-    fun isOnline(context: Context): Boolean {
-        return try {
-            val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager? ?: return false
-            val network = cm.activeNetwork ?: return false
-            val caps = cm.getNetworkCapabilities(network) ?: return false
-            caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
-                    caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-        } catch (_: SecurityException) {
-            false
-        }
-    }
-}

app/src/main/java/com/dano/test1/data/AppDatabase.kt

@@ -3,6 +3,18 @@ package com.dano.test1.data
 import androidx.room.Database
 import androidx.room.RoomDatabase
 
+/*
+Zentrale Room-Datenbank der App. Diese Klasse beschreibt:
+ - welche Tabellen (entities) es gibt: Client, Questionnaire, Question, Answer, CompletedQuestionnaire
+ - die Datenbank-Version (version = 1) für Migrations/Schema-Updates
+
+Über die abstrakten DAO-Getter (clientDao(), questionnaireDao(), …) erhält der Rest der App Typsichere Zugriffe auf die jeweiligen Tabellen.
+
+Hinweis:
+ - Room erzeugt zur Build-Zeit die konkrete Implementierung dieser abstrakten Klasse.
+ - Eine Instanz der Datenbank wird typischerweise per Room.databaseBuilder(...) erstellt und als Singleton verwendet.
+ */
+
 @Database(
     entities = [
         Client::class,

app/src/main/java/com/dano/test1/data/Daos.kt

@@ -2,8 +2,18 @@ package com.dano.test1.data
 
 import androidx.room.*
 
+/*
+Data-Access-Objekte (DAOs) für die Room-Datenbank.
+Sie kapseln alle typsicheren Lese-/Schreiboperationen für die Tabellen clients, questionnaires, questions, answers und completed_questionnaires.
+
+Hinweis:
+ - Die konkreten Implementierungen erzeugt Room zur Build-Zeit.
+ - DAOs werden über die AppDatabase (Room.databaseBuilder(...)) bezogen.
+*/
+
 @Dao
 interface ClientDao {
+
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertClient(client: Client)
 
@@ -20,9 +30,9 @@ interface ClientDao {
     suspend fun getAllClients(): List<Client>
 }
 
-
 @Dao
 interface QuestionnaireDao {
+
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertQuestionnaire(questionnaire: Questionnaire)
 
@@ -30,11 +40,12 @@ interface QuestionnaireDao {
     suspend fun getById(id: String): Questionnaire?
 
     @Query("SELECT * FROM questionnaires")
-    suspend fun getAll(): List<Questionnaire> // <-- NEU
+    suspend fun getAll(): List<Questionnaire>
 }
 
 @Dao
 interface QuestionDao {
+
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertQuestions(questions: List<Question>)
 
@@ -48,8 +59,10 @@ interface QuestionDao {
     suspend fun getQuestionsForQuestionnaire(questionnaireId: String): List<Question>
 }
 
+
 @Dao
 interface AnswerDao {
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAnswers(answers: List<Answer>)
 
@@ -79,9 +92,9 @@ interface AnswerDao {
     )
 }
 
-
 @Dao
 interface CompletedQuestionnaireDao {
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(entry: CompletedQuestionnaire)
 
@@ -93,4 +106,4 @@ interface CompletedQuestionnaireDao {
 
     @Query("SELECT questionnaireId FROM completed_questionnaires WHERE clientCode = :clientCode")
     suspend fun getCompletedQuestionnairesForClient(clientCode: String): List<String>
-}
+}

app/src/main/java/com/dano/test1/data/Entities.kt

@@ -2,16 +2,41 @@ package com.dano.test1.data
 
 import androidx.room.*
 
+/*
+Room-Entities (Tabellen) der App.
+ - Definieren das Schema für Clients, Questionnaires, Questions, Answers und CompletedQuestionnaires.
+ - Beziehungen:
+     * Question -> Questionnaire (FK, CASCADE)
+     * Answer   -> Client (FK, CASCADE)
+     * Answer   -> Question (FK, CASCADE)
+     * CompletedQuestionnaire -> Client (FK, CASCADE)
+     * CompletedQuestionnaire -> Questionnaire (FK, CASCADE)
+ - Primärschlüssel:
+     * Client: clientCode
+     * Questionnaire: id
+     * Question: questionId
+     * Answer: (clientCode, questionId) – eine Antwort je Client & Frage
+     * CompletedQuestionnaire: (clientCode, questionnaireId) – ein Status je Client & Fragebogen
+*/
+
+/* Tabelle: clients – Eindeutige Identifikation eines Clients per clientCode. */
 @Entity(tableName = "clients")
 data class Client(
     @PrimaryKey val clientCode: String,
 )
 
+/* Tabelle: questionnaires – Eindeutige Fragebogen-IDs. */
 @Entity(tableName = "questionnaires")
 data class Questionnaire(
     @PrimaryKey val id: String,
 )
 
+/*
+Tabelle: questions
+ - Jede Frage gehört zu genau einem Fragebogen (questionnaireId).
+ - Fremdschlüssel sorgt dafür, dass beim Löschen eines Fragebogens die zugehörigen Fragen mit gelöscht werden.
+ - Index auf questionnaireId beschleunigt Abfragen „alle Fragen eines Fragebogens“.
+*/
 @Entity(
     tableName = "questions",
     foreignKeys = [
@@ -30,6 +55,12 @@ data class Question(
     val question: String = ""
 )
 
+/*
+Tabelle: answers
+ - Zusammengesetzter Primärschlüssel (clientCode, questionId):
+     * Pro Client und Frage existiert höchstens eine Antwort.
+     * Löscht man den Client oder die Frage, werden die zugehörigen Antworten mit entfernt.
+*/
 @Entity(
     tableName = "answers",
     primaryKeys = ["clientCode", "questionId"],
@@ -55,6 +86,17 @@ data class Answer(
     val answerValue: String = ""
 )
 
+/*
+Tabelle: completed_questionnaires
+ - Zusammengesetzter Primärschlüssel (clientCode, questionnaireId):
+     * Hält den Abschluss-Status eines Fragebogens pro Client.
+ - FKs mit CASCADE:
+     * Beim Löschen eines Clients oder Fragebogens verschwindet der Status-Eintrag ebenfalls.
+ - Indizes auf clientCode und questionnaireId für schnelle Lookups.
+ - timestamp: Zeitpunkt der Statusänderung (Default: now).
+ - isDone: true/false – abgeschlossen oder nicht.
+ - sumPoints: optionaler Score des Fragebogens.
+*/
 @Entity(
     tableName = "completed_questionnaires",
     primaryKeys = ["clientCode", "questionnaireId"],
@@ -81,4 +123,3 @@ data class CompletedQuestionnaire(
     val isDone: Boolean,
     val sumPoints: Int? = null
 )
-

app/src/main/java/com/dano/test1/data/ExcelExportService.kt

@@ -1,4 +1,4 @@
-package com.dano.test1
+package com.dano.test1.data
 
 import android.content.ContentValues
 import android.content.Context
@@ -7,15 +7,36 @@ import android.net.Uri
 import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
+import com.dano.test1.LanguageManager
+import com.dano.test1.MyApp
 import org.apache.poi.ss.usermodel.Row
 import org.apache.poi.xssf.usermodel.XSSFWorkbook
+import java.io.ByteArrayOutputStream
+import java.io.File
 
+/*
+Aufgabe:
+- Baut eine Excel-Datei (XLSX) mit allen Clients als Zeilen und einem konfigurierbaren Spalten-Layout.
+- Speichert die Datei ausschließlich in den öffentlichen „Downloads“-Ordner
+
+Datenquelle:
+- Liest die Spaltenreihenfolge/Spalten-IDs über HeaderOrderRepository.loadOrderedIds().
+- Holt alle Clients, Fragebogen-IDs  sowie Antworten aus der lokalen Room-Datenbank
+
+Ausgabeformat (Sheet „Headers“):
+- Zeile 1: Spalten-IDs (erste Zelle „#“ für laufende Nummer).
+- Zeile 2: Englische Beschriftung/Fragetext je Spalte (ermittelt via englishQuestionForId + LanguageManager).
+- Ab Zeile 3: Pro Client eine Datenzeile.
+    * Für Spalten-ID „client_code“: der Client-Code.
+    * Für Spalten-IDs, die einem Fragebogen entsprechen (Questionnaire-ID): „Done“/„Not Done“ (Abschlussstatus).
+    * Für sonstige Spalten-IDs (Antwort-IDs): Antwortwert oder „None“, falls leer.
+*/
 class ExcelExportService(
     private val context: Context,
     private val headerRepo: HeaderOrderRepository
 ) {
 
-    /** Baut die Excel-Datei und speichert sie ausschließlich unter "Downloads". */
+    /* Baut die Excel-Datei und speichert sie ausschließlich unter "Downloads". */
     suspend fun exportHeadersForAllClients(): Uri? {
         val orderedIds = headerRepo.loadOrderedIds()
         if (orderedIds.isEmpty()) return null
@@ -66,7 +87,7 @@ class ExcelExportService(
             }
         }
 
-        val bytes = java.io.ByteArrayOutputStream().use { bos ->
+        val bytes = ByteArrayOutputStream().use { bos ->
             wb.write(bos); bos.toByteArray()
         }
         wb.close()
@@ -78,7 +99,6 @@ class ExcelExportService(
         )
     }
 
-    /** Speichert Bytes nach "Downloads". */
     private fun saveToDownloads(filename: String, mimeType: String, bytes: ByteArray): Uri? {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             val resolver = context.contentResolver
@@ -96,7 +116,7 @@ class ExcelExportService(
         } else {
             val downloadsDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
             if (!downloadsDir.exists()) downloadsDir.mkdirs()
-            val outFile = java.io.File(downloadsDir, filename)
+            val outFile = File(downloadsDir, filename)
             outFile.writeBytes(bytes)
             MediaScannerConnection.scanFile(
                 context,
@@ -108,7 +128,6 @@ class ExcelExportService(
         }
     }
 
-    // ---------- Export-spezifische Lokalisierung (EN) ----------
     private suspend fun englishQuestionForId(id: String, questionnaireIdSet: Set<String>): String {
         if (id == "client_code") return "Client code"
         if (id in questionnaireIdSet && !id.contains('-')) return "Questionnaire status"
@@ -147,7 +166,7 @@ class ExcelExportService(
         return stripped
     }
 
-    /** Englisch für Export; belässt Done/Not Done/None. */
+    /* Englisch für Export; belässt Done/Not Done/None. */
     private fun localizeForExportEn(id: String, raw: String): String {
         if (id == "client_code") return raw
         if (raw == "Done" || raw == "Not Done" || raw == "None") return raw
@@ -160,4 +179,4 @@ class ExcelExportService(
         for (key in candidates) localizeEnglishNoBrackets(key)?.let { return it }
         return raw
     }
-}
+}

app/src/main/java/com/dano/test1/data/HeaderOrderRepository.kt

@@ -1,12 +1,21 @@
-package com.dano.test1
+package com.dano.test1.data
 
 import android.content.Context
 import android.util.Log
 import android.widget.Toast
+import com.dano.test1.LanguageManager
+import org.apache.poi.ss.usermodel.CellType
+import org.apache.poi.ss.usermodel.DateUtil
 import org.apache.poi.xssf.usermodel.XSSFWorkbook
 import org.json.JSONArray
 import java.nio.charset.Charset
 
+/*
+Zweck:
+- Liefert die Reihenfolge/IDs der zu exportierenden Header (Spalten) für den Excel-Export.
+- Bevorzugte Quelle ist eine Excel-Datei aus den App-Assets („header_order.xlsx“), als Fallback wird eine JSON-Datei („header_order.json“) genutzt.
+
+*/
 class HeaderOrderRepository(
     private val context: Context,
     // Sprache abrufen (Standard: Deutsch, damit es ohne OpeningScreen schon sinnvoll ist)
@@ -57,16 +66,16 @@ class HeaderOrderRepository(
                 for (i in first until last) {
                     val cell = row.getCell(i) ?: continue
                     val value = when (cell.cellType) {
-                        org.apache.poi.ss.usermodel.CellType.STRING   -> cell.stringCellValue
-                        org.apache.poi.ss.usermodel.CellType.NUMERIC  ->
-                            if (org.apache.poi.ss.usermodel.DateUtil.isCellDateFormatted(cell))
+                        CellType.STRING   -> cell.stringCellValue
+                        CellType.NUMERIC  ->
+                            if (DateUtil.isCellDateFormatted(cell))
                                 cell.dateCellValue.time.toString()
                             else {
                                 val n = cell.numericCellValue
                                 if (n % 1.0 == 0.0) n.toLong().toString() else n.toString()
                             }
-                        org.apache.poi.ss.usermodel.CellType.BOOLEAN  -> cell.booleanCellValue.toString()
-                        org.apache.poi.ss.usermodel.CellType.FORMULA  -> cell.richStringCellValue.string
+                        CellType.BOOLEAN  -> cell.booleanCellValue.toString()
+                        CellType.FORMULA  -> cell.richStringCellValue.string
                         else                                          -> ""
                     }.trim()
 

app/src/main/java/com/dano/test1/network/DatabaseDownloader.kt

@@ -1,7 +1,8 @@
-package com.dano.test1
+package com.dano.test1.network
 
 import android.content.Context
 import android.util.Log
+import com.dano.test1.AES256Helper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -14,7 +15,7 @@ import java.io.FileOutputStream
 object DatabaseDownloader {
 
     private const val DB_NAME = "questionnaire_database"
-    private const val SERVER_DOWNLOAD_URL = "http://49.13.157.44/downloadFull.php"
+    private const val SERVER_DOWNLOAD_URL = "https://daniel-ocks.de/qdb/downloadFull.php"
 
     private val client = OkHttpClient()
 

app/src/main/java/com/dano/test1/network/DatabaseUploader.kt

@@ -1,5 +1,4 @@
-// app/src/main/java/com/dano/test1/DatabaseUploader.kt
-package com.dano.test1
+package com.dano.test1.network
 
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
@@ -9,6 +8,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import android.database.Cursor
+import com.dano.test1.AES256Helper
 import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.asRequestBody
@@ -21,25 +21,11 @@ import kotlin.system.exitProcess
 object DatabaseUploader {
 
     private const val DB_NAME = "questionnaire_database"
-    private const val SERVER_DELTA_URL = "http://49.13.157.44/uploadDeltaTest5.php"
-    private const val SERVER_CHECK_URL = "http://49.13.157.44/checkDatabaseExists.php"
+    private const val SERVER_DELTA_URL = "https://daniel-ocks.de/qdb/uploadDeltaTest5.php"
+    private const val SERVER_CHECK_URL = "https://daniel-ocks.de/qdb/checkDatabaseExists.php"
 
     private val client = OkHttpClient()
 
-    /** NEU: Login mit Username+Password, danach Upload wie gehabt */
-    fun uploadDatabaseWithLogin(context: Context, username: String, password: String) {
-        LoginManager.loginUserWithCredentials(
-            context = context,
-            username = username,
-            password = password,
-            onSuccess = { token ->
-                Log.d("UPLOAD", "Login OK (user=$username)")
-                uploadDatabase(context, token)
-            },
-            onError = { msg -> Log.e("UPLOAD", "Login fehlgeschlagen: $msg") }
-        )
-    }
-
     private fun uploadDatabase(context: Context, token: String) {
         CoroutineScope(Dispatchers.IO).launch {
             try {
@@ -49,6 +35,7 @@ object DatabaseUploader {
                     return@launch
                 }
 
+                // WAL sauber schließen (falls aktiv)
                 try {
                     val db = SQLiteDatabase.openDatabase(dbFile.absolutePath, null, SQLiteDatabase.OPEN_READWRITE)
                     db.rawQuery("PRAGMA wal_checkpoint(FULL);", null).use { /* noop */ }
@@ -82,11 +69,14 @@ object DatabaseUploader {
                 put("questionnaires", queryToJsonArray(db, "SELECT id FROM questionnaires"))
                 put("questions", queryToJsonArray(db, "SELECT questionId, questionnaireId, question FROM questions"))
                 put("answers", queryToJsonArray(db, "SELECT clientCode, questionId, answerValue FROM answers"))
-                put("completed_questionnaires",
-                    queryToJsonArray(db, "SELECT clientCode, questionnaireId, timestamp, isDone, sumPoints FROM completed_questionnaires"))
+                put(
+                    "completed_questionnaires",
+                    queryToJsonArray(db, "SELECT clientCode, questionnaireId, timestamp, isDone, sumPoints FROM completed_questionnaires")
+                )
             }
             db.close()
 
+            // JSON -> verschlüsselte Payload
             val tmpJson = File(context.cacheDir, "payload.json").apply { writeText(data.toString()) }
             val tmpEnc = File(context.cacheDir, "payload.enc")
             try {
@@ -98,11 +88,17 @@ object DatabaseUploader {
 
             val body = MultipartBody.Builder()
                 .setType(MultipartBody.FORM)
-                .addFormDataPart("token", token)
+                .addFormDataPart("token", token) // bleibt für Kompatibilität enthalten
                 .addFormDataPart("file", "payload.enc", tmpEnc.asRequestBody("application/octet-stream".toMediaType()))
                 .build()
 
-            val request = Request.Builder().url("http://49.13.157.44/uploadDeltaTest5.php").post(body).build()
+            // WICHTIG: Jetzt HTTPS + Konstanten-URL verwenden, plus Bearer-Header
+            val request = Request.Builder()
+                .url(SERVER_DELTA_URL)
+                .post(body)
+                .header("Authorization", "Bearer $token")
+                .build()
+
             client.newCall(request).enqueue(object : Callback {
                 override fun onFailure(call: Call, e: IOException) {
                     Log.e("UPLOAD", "Fehlgeschlagen: ${e.message}")
@@ -113,7 +109,7 @@ object DatabaseUploader {
                     if (response.isSuccessful) {
                         Log.d("UPLOAD", "OK: $respBody")
 
-                        // <<< alte Logik wieder aktivieren: lokale DB + Neben­dateien löschen
+                        // alte Logik: lokale DB + Neben­dateien löschen
                         try {
                             if (!file.delete()) Log.w("UPLOAD", "Lokale DB nicht gelöscht.")
                             File(file.parent, "${file.name}-journal").delete()
@@ -122,11 +118,12 @@ object DatabaseUploader {
                         } catch (e: Exception) {
                             Log.w("UPLOAD", "Fehler beim Löschen lokaler DB-Dateien", e)
                         }
-                        // >>>
                     } else {
                         Log.e("UPLOAD", "HTTP ${response.code}: $respBody")
                     }
                     tmpJson.delete(); tmpEnc.delete()
+
+                    // unverändert beibehalten
                     try { exitProcess(0) } catch (_: Exception) {}
                 }
             })
@@ -162,6 +159,8 @@ object DatabaseUploader {
     }
 
     fun uploadDatabaseWithToken(context: Context, token: String) {
-        uploadDatabase(context, token) // nutzt die bestehende interne Logik
+        uploadDatabase(context, token)
     }
+
+
 }

app/src/main/java/com/dano/test1/network/LoginManager.kt

@@ -0,0 +1,218 @@
+package com.dano.test1.network
+
+import android.app.AlertDialog
+import android.content.Context
+import android.text.InputType
+import android.util.Log
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.Toast
+import kotlinx.coroutines.*
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+
+object LoginManager {
+    private const val SERVER_LOGIN_URL = "https://daniel-ocks.de/qdb/login.php"
+    private const val SERVER_CHANGE_URL = "https://daniel-ocks.de/qdb/change_password.php"
+    private val client = OkHttpClient()
+
+    fun loginUserWithCredentials(
+        context: Context,
+        username: String,
+        password: String,
+        onSuccess: (String) -> Unit,
+        onError: (String) -> Unit
+    ) {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val bodyJson = JSONObject()
+                    .put("username", username)
+                    .put("password", password)
+                    .toString()
+                    .toRequestBody("application/json".toMediaType())
+
+                val request = Request.Builder()
+                    .url(SERVER_LOGIN_URL)
+                    .post(bodyJson)
+                    .build()
+
+                val response = client.newCall(request).execute()
+                val text = response.body?.string()
+
+                if (!response.isSuccessful || text == null) {
+                    withContext(Dispatchers.Main) { onError("Fehler beim Login (${response.code})") }
+                    return@launch
+                }
+
+                val json = JSONObject(text)
+                if (!json.optBoolean("success")) {
+                    withContext(Dispatchers.Main) { onError(json.optString("message", "Login fehlgeschlagen")) }
+                    return@launch
+                }
+
+                // Passwortwechsel erforderlich?
+                if (json.optBoolean("must_change_password", false)) {
+                    withContext(Dispatchers.Main) {
+                        showChangePasswordDialog(
+                            context = context,
+                            username = username,
+                            oldPassword = password,
+                            onChanged = { token ->
+                                // Nach PW-Änderung direkt eingeloggt
+                                TokenStore.save(context, token, username)
+                                onSuccess(token)
+                            },
+                            onError = onError
+                        )
+                    }
+                    return@launch
+                }
+
+                // normaler Login: Token speichern
+                val token = json.getString("token")
+                TokenStore.save(context, token, username)
+                withContext(Dispatchers.Main) { onSuccess(token) }
+
+            } catch (e: Exception) {
+                Log.e("LOGIN", "Exception", e)
+                withContext(Dispatchers.Main) { onError("Exception: ${e.message}") }
+            }
+        }
+    }
+
+    private fun showChangePasswordDialog(
+        context: Context,
+        username: String,
+        oldPassword: String,
+        onChanged: (String) -> Unit,
+        onError: (String) -> Unit
+    ) {
+        val container = LinearLayout(context).apply {
+            orientation = LinearLayout.VERTICAL
+            setPadding(48, 24, 48, 0)
+        }
+        val etNew = EditText(context).apply {
+            hint = "Neues Passwort"
+            inputType = InputType.TYPE_CLASS_TEXT or
+                    InputType.TYPE_TEXT_VARIATION_PASSWORD
+        }
+        val etRepeat = EditText(context).apply {
+            hint = "Neues Passwort (wiederholen)"
+            inputType = InputType.TYPE_CLASS_TEXT or
+                    InputType.TYPE_TEXT_VARIATION_PASSWORD
+        }
+        container.addView(etNew)
+        container.addView(etRepeat)
+
+        val dialog = AlertDialog.Builder(context)
+            .setTitle("Passwort ändern")
+            .setMessage("Du verwendest ein Standard-Konto. Bitte setze jetzt ein eigenes Passwort.")
+            .setView(container)
+            .setPositiveButton("OK", null)        // nicht sofort schließen lassen
+            .setNegativeButton("Abbrechen", null) // nicht sofort schließen lassen
+            .setCancelable(false)
+            .create()
+
+        dialog.setOnShowListener {
+            val btnOk = dialog.getButton(AlertDialog.BUTTON_POSITIVE)
+            val btnCancel = dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
+
+            btnOk.setOnClickListener {
+                etNew.error = null
+                etRepeat.error = null
+
+                val p1 = etNew.text?.toString().orEmpty()
+                val p2 = etRepeat.text?.toString().orEmpty()
+
+                when {
+                    p1.length < 6 -> {
+                        etNew.error = "Mindestens 6 Zeichen."
+                        return@setOnClickListener
+                    }
+                    p1 != p2 -> {
+                        etRepeat.error = "Passwörter stimmen nicht überein."
+                        return@setOnClickListener
+                    }
+                    else -> {
+                        btnOk.isEnabled = false
+                        btnCancel.isEnabled = false
+                        changePassword(
+                            context = context,
+                            username = username,
+                            oldPassword = oldPassword,
+                            newPassword = p1,
+                            onChanged = { token ->
+                                dialog.dismiss()
+                                onChanged(token)
+                            },
+                            onError = { msg ->
+                                btnOk.isEnabled = true
+                                btnCancel.isEnabled = true
+                                Toast.makeText(context, msg, Toast.LENGTH_LONG).show()
+                            }
+                        )
+                    }
+                }
+            }
+
+            // >>> Überarbeitet: Abbrechen schließt Dialog und informiert den Aufrufer
+            btnCancel.setOnClickListener {
+                dialog.dismiss()
+                onError("Passwortänderung abgebrochen.")
+            }
+        }
+
+        dialog.show()
+    }
+
+
+
+    private fun changePassword(
+        context: Context,
+        username: String,
+        oldPassword: String,
+        newPassword: String,
+        onChanged: (String) -> Unit,
+        onError: (String) -> Unit
+    ) {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val body = JSONObject()
+                    .put("username", username)
+                    .put("old_password", oldPassword)
+                    .put("new_password", newPassword)
+                    .toString()
+                    .toRequestBody("application/json".toMediaType())
+
+                val req = Request.Builder()
+                    .url(SERVER_CHANGE_URL)
+                    .post(body)
+                    .build()
+
+                val resp = client.newCall(req).execute()
+                val txt = resp.body?.string()
+
+                if (!resp.isSuccessful || txt == null) {
+                    withContext(Dispatchers.Main) { onError("Fehler beim Ändern (${resp.code})") }
+                    return@launch
+                }
+
+                val json = JSONObject(txt)
+                if (!json.optBoolean("success")) {
+                    withContext(Dispatchers.Main) { onError(json.optString("message", "Ändern fehlgeschlagen")) }
+                    return@launch
+                }
+
+                val token = json.getString("token")
+                withContext(Dispatchers.Main) { onChanged(token) }
+
+            } catch (e: Exception) {
+                Log.e("LOGIN", "changePassword Exception", e)
+                withContext(Dispatchers.Main) { onError("Exception: ${e.message}") }
+            }
+        }
+    }
+}

app/src/main/java/com/dano/test1/network/NetworkUtilis.kt

@@ -0,0 +1,33 @@
+package com.dano.test1.network
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+
+/*
+Zweck:
+- Einfache Hilfsklasse, um den aktuellen Online-Status des Geräts zu prüfen.
+
+Funktionsweise:
+- `isOnline(context)` nutzt den systemweiten `ConnectivityManager`, fragt die aktive Verbindung (`activeNetwork`) ab und prüft deren `NetworkCapabilities`.
+- Es wird nur dann `true` zurückgegeben, wenn:
+  * eine aktive Verbindung existiert und
+  * die Verbindung die Fähigkeit „INTERNET“ besitzt und
+  * die Verbindung als „VALIDATED“ gilt (vom System als funktionsfähig verifiziert).
+
+Verwendung:
+- Vo Netzwerkaufrufen (Login, Upload, Download) aufrufen, um „Offline“-Fälle frühzeitig abzufangen und nutzerfreundliche Meldungen zu zeigen.
+*/
+object NetworkUtils {
+    fun isOnline(context: Context): Boolean {
+        return try {
+            val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager? ?: return false
+            val network = cm.activeNetwork ?: return false
+            val caps = cm.getNetworkCapabilities(network) ?: return false
+            caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
+                    caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+        } catch (_: SecurityException) {
+            false
+        }
+    }
+}

app/src/main/java/com/dano/test1/network/TokenStore.kt

@@ -1,21 +1,33 @@
-package com.dano.test1
+package com.dano.test1.network
 
 import android.content.Context
 
+/*
+TokenStore
+ - Kleiner Helper zum Verwalten der Login-Sitzung
+ - Speichert:
+     * das API-Token (KEY_TOKEN),
+     * den Usernamen (KEY_USER),
+     * den Zeitpunkt des Logins in Millisekunden (KEY_LOGIN_TS).
+ - Bietet Lese-/Schreib-Methoden sowie ein clear(), um alles zurückzusetzen.
+
+Hinweis:
+ - Die Daten liegen in einer privaten App-Preference-Datei (PREF = "qdb_prefs").
+ - getLoginTimestamp() eignet sich, um die Token-„Frische“ (Alter) zu berechnen.
+*/
 object TokenStore {
     private const val PREF = "qdb_prefs"
     private const val KEY_TOKEN = "token"
     private const val KEY_USER = "user"
     private const val KEY_LOGIN_TS = "login_ts"
 
-    /** Speichert Token, Username und Login-Timestamp (jetzt) */
     fun save(context: Context, token: String, username: String) {
         val now = System.currentTimeMillis()
         context.getSharedPreferences(PREF, Context.MODE_PRIVATE)
             .edit()
-            .putString(KEY_TOKEN, token)
-            .putString(KEY_USER, username)
-            .putLong(KEY_LOGIN_TS, now)
+            .putString(KEY_TOKEN, token)   // API-/Session-Token
+            .putString(KEY_USER, username) // angemeldeter Benutzername
+            .putLong(KEY_LOGIN_TS, now)    // Zeitpunkt des Logins
             .apply()
     }
 

app/src/main/java/com/dano/test1/questionnaire/QuestionHandler.kt

@@ -1,4 +1,4 @@
-package com.dano.test1
+package com.dano.test1.questionnaire
 import android.view.View
 
 interface QuestionHandler {

app/src/main/java/com/dano/test1/questionnaire/QuestionnaireBase.kt

@@ -1,10 +1,23 @@
-package com.dano.test1
+package com.dano.test1.questionnaire
 
+import android.R
 import android.app.Activity
 import android.util.Log
 import android.view.View
 import android.widget.*
+import com.dano.test1.LanguageManager
+import com.dano.test1.MainActivity
+import com.dano.test1.MyApp
 import com.dano.test1.data.*
+import com.dano.test1.questionnaire.handlers.HandlerClientCoachCode
+import com.dano.test1.questionnaire.handlers.HandlerClientNotSigned
+import com.dano.test1.questionnaire.handlers.HandlerDateSpinner
+import com.dano.test1.questionnaire.handlers.HandlerGlassScaleQuestion
+import com.dano.test1.questionnaire.handlers.HandlerLastPage
+import com.dano.test1.questionnaire.handlers.HandlerMultiCheckboxQuestion
+import com.dano.test1.questionnaire.handlers.HandlerRadioQuestion
+import com.dano.test1.questionnaire.handlers.HandlerStringSpinner
+import com.dano.test1.questionnaire.handlers.HandlerValueSpinner
 import com.google.gson.Gson
 import com.google.gson.JsonParser
 import kotlinx.coroutines.*
@@ -61,8 +74,8 @@ abstract class QuestionnaireBase<T> {
     }
 
     protected fun setupSpinner(spinner: Spinner, spinnerValues: List<Any>, selectedValue: Any?) {
-        val adapter = ArrayAdapter(context, android.R.layout.simple_spinner_item, spinnerValues).apply {
-            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        val adapter = ArrayAdapter(context, R.layout.simple_spinner_item, spinnerValues).apply {
+            setDropDownViewResource(R.layout.simple_spinner_dropdown_item)
         }
         spinner.adapter = adapter
         selectedValue?.let { value ->
@@ -75,7 +88,7 @@ abstract class QuestionnaireBase<T> {
 
     protected fun navigateTo(layoutResId: Int, setup: (View) -> Unit) {
         context.setContentView(layoutResId)
-        val rootView = context.findViewById<View>(android.R.id.content)
+        val rootView = context.findViewById<View>(R.id.content)
         setup(rootView)
     }
 
@@ -85,7 +98,7 @@ abstract class QuestionnaireBase<T> {
 
     protected fun showEmptyScreen() {
         navigateTo(getLayoutResId("empty")) {
-            setupPrevButton(R.id.Qprev) { goToPreviousQuestion() }
+            setupPrevButton(com.dano.test1.R.id.Qprev) { goToPreviousQuestion() }
         }
     }
 

app/src/main/java/com/dano/test1/questionnaire/QuestionnaireGeneric.kt

@@ -1,6 +1,8 @@
-package com.dano.test1
+package com.dano.test1.questionnaire
 
 import android.widget.Button
+import com.dano.test1.LocalizationHelper
+import com.dano.test1.R
 
 open class QuestionnaireGeneric(private val questionnaireFileName: String) : QuestionnaireBase<Unit>() {
 

app/src/main/java/com/dano/test1/questionnaire/QuestionnaireItem.kt

@@ -1,4 +1,4 @@
-package com.dano.test1
+package com.dano.test1.questionnaire
 
 data class Option(
     val key: String,               // Must always be set

app/src/main/java/com/dano/test1/questionnaire/handlers/HandlerClientCoachCode.kt

@@ -1,14 +1,25 @@
-package com.dano.test1
+package com.dano.test1.questionnaire.handlers
 
 import android.view.View
 import android.widget.*
-import android.util.TypedValue
-import androidx.core.widget.TextViewCompat
+import com.dano.test1.questionnaire.GlobalValues
+import com.dano.test1.LanguageManager
+import com.dano.test1.MyApp
+import com.dano.test1.questionnaire.QuestionHandler
+import com.dano.test1.questionnaire.QuestionItem
+import com.dano.test1.R
+import com.dano.test1.network.TokenStore
+import com.dano.test1.utils.ViewUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
+/*
+Zweck :
+- Steuert die Eingabeseite für „Client Code“ und „Coach Code“ innerhalb des Fragebogen-Flows.
+*/
+
 class HandlerClientCoachCode(
     private val answers: MutableMap<String, Any>,
     private val languageID: String,
@@ -33,10 +44,10 @@ class HandlerClientCoachCode(
 
         questionTextView.text = question.question?.let { LanguageManager.getText(languageID, it) } ?: ""
 
-        setTextSizePercentOfScreenHeight(titleTextView,    0.03f)
-        setTextSizePercentOfScreenHeight(questionTextView, 0.03f)
-        setTextSizePercentOfScreenHeight(clientCodeField,  0.025f)
-        setTextSizePercentOfScreenHeight(coachCodeField,   0.025f)
+        ViewUtils.setTextSizePercentOfScreenHeight(titleTextView,    0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(questionTextView, 0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(clientCodeField,  0.025f)
+        ViewUtils.setTextSizePercentOfScreenHeight(coachCodeField,   0.025f)
 
         // Client-Code: nur verwenden, wenn bereits geladen
         val loadedClientCode = GlobalValues.LOADED_CLIENT_CODE
@@ -48,11 +59,11 @@ class HandlerClientCoachCode(
             clientCodeField.isEnabled = true
         }
 
-        // === NEU: Coach-Code immer aus dem Login (TokenStore) setzen und sperren ===
+        // Coach-Code immer aus dem Login (TokenStore) setzen und sperren
         val coachFromLogin = TokenStore.getUsername(layout.context)
         if (!coachFromLogin.isNullOrBlank()) {
             coachCodeField.setText(coachFromLogin)
-            lockCoachField(coachCodeField) // optisch & technisch gesperrt
+            ViewUtils.lockEditField(coachCodeField) // optisch & technisch gesperrt
         } else {
             // Falls (theoretisch) kein Login-Username vorhanden ist, verhalten wie bisher
             coachCodeField.setText(answers["coach_code"] as? String ?: "")
@@ -67,13 +78,6 @@ class HandlerClientCoachCode(
         }
     }
 
-    private fun setTextSizePercentOfScreenHeight(view: TextView, percentOfHeight: Float) {
-        val dm = layout.resources.displayMetrics
-        val sp = (dm.heightPixels * percentOfHeight) / dm.scaledDensity
-        TextViewCompat.setAutoSizeTextTypeWithDefaults(view, TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE)
-        view.setTextSize(TypedValue.COMPLEX_UNIT_SP, sp)
-    }
-
     private fun onNextClicked(clientCodeField: EditText, coachCodeField: EditText) {
         val loadedClientCode = GlobalValues.LOADED_CLIENT_CODE
 
@@ -122,7 +126,6 @@ class HandlerClientCoachCode(
 
     override fun validate(): Boolean {
         val clientCode = layout.findViewById<EditText>(R.id.client_code).text
-        // Validierung nimmt den (ggf. gesperrten) Text – passt
         val coachText   = layout.findViewById<EditText>(R.id.coach_code).text
         return clientCode.isNotBlank() && coachText.isNotBlank()
     }
@@ -139,20 +142,4 @@ class HandlerClientCoachCode(
         // Not used
     }
 
-    // --- Helfer zum Sperren inkl. optischer Markierung (wie im Opening Screen) ---
-    private fun lockCoachField(field: EditText) {
-        field.isFocusable = false
-        field.isFocusableInTouchMode = false
-        field.isCursorVisible = false
-        field.keyListener = null
-        field.isLongClickable = false
-        field.isClickable = false
-        field.setBackgroundResource(R.drawable.bg_field_locked)
-        field.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_24, 0)
-        field.compoundDrawablePadding = dp(8)
-        field.alpha = 0.95f
-    }
-
-    private fun dp(v: Int): Int =
-        (v * layout.resources.displayMetrics.density).toInt()
 }

app/src/main/java/com/dano/test1/questionnaire/handlers/HandlerClientNotSigned.kt

@@ -1,7 +1,17 @@
-package com.dano.test1
+package com.dano.test1.questionnaire.handlers
 
 import android.view.View
 import android.widget.*
+import com.dano.test1.LanguageManager
+import com.dano.test1.questionnaire.QuestionHandler
+import com.dano.test1.questionnaire.QuestionItem
+import com.dano.test1.R
+
+/*
+Zweck:
+- Steuert die Seite „Client hat nicht unterschrieben“ im Fragebogenfluss.
+- Speichert den eingegebenen Coach-Code in das Answers-Map unter question.id (saveAnswer), damit der nachfolgende Prozess darauf zugreifen kann.
+*/
 
 class HandlerClientNotSigned(
     private val answers: MutableMap<String, Any>,
@@ -14,7 +24,6 @@ class HandlerClientNotSigned(
     private lateinit var layout: View
     private lateinit var question: QuestionItem.ClientNotSigned
 
-    // UI components
     private lateinit var textView1: TextView
     private lateinit var textView2: TextView
     private lateinit var questionTextView: TextView
@@ -26,29 +35,24 @@ class HandlerClientNotSigned(
         this.layout = layout
         this.question = question
 
-        // Initialize UI components only once
+
         initViews()
 
-        // Set localized text values from LanguageManager
         textView1.text = question.textKey1?.let { LanguageManager.getText(languageID, it) } ?: ""
         textView2.text = question.textKey2?.let { LanguageManager.getText(languageID, it) } ?: ""
         questionTextView.text = question.question?.let { LanguageManager.getText(languageID, it) } ?: ""
 
-        // Populate EditText with previous value if exists
         coachCodeField.setText(answers[question.id] as? String ?: "")
 
-        // Set click listener for Next button
         layout.findViewById<Button>(R.id.Qnext).setOnClickListener {
             onNextClicked()
         }
 
-        // Set click listener for Previous button
         layout.findViewById<Button>(R.id.Qprev).setOnClickListener {
             goToPreviousQuestion()
         }
     }
 
-    // Initialize all views once to avoid repeated findViewById calls
     private fun initViews() {
         textView1 = layout.findViewById(R.id.textView1)
         textView2 = layout.findViewById(R.id.textView2)
@@ -56,7 +60,6 @@ class HandlerClientNotSigned(
         coachCodeField = layout.findViewById(R.id.coach_code)
     }
 
-    // Handle Next button click
     private fun onNextClicked() {
         if (validate()) {
             saveAnswer()
@@ -67,13 +70,11 @@ class HandlerClientNotSigned(
         }
     }
 
-    // Validate that coach code field is not empty
     override fun validate(): Boolean {
         val coachCode = coachCodeField.text
         return coachCode.isNotBlank()
     }
 
-    // Save entered coach code to answers map
     override fun saveAnswer() {
         answers[question.id] = coachCodeField.text.toString()
     }

app/src/main/java/com/dano/test1/questionnaire/handlers/HandlerDateSpinner.kt

@@ -1,15 +1,26 @@
-package com.dano.test1
+package com.dano.test1.questionnaire.handlers
 
 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
-import androidx.core.widget.TextViewCompat
-import android.widget.AbsListView
+import com.dano.test1.questionnaire.GlobalValues
+import com.dano.test1.LanguageManager
+import com.dano.test1.questionnaire.MAX_VALUE_YEAR
+import com.dano.test1.ui.Month
+import com.dano.test1.ui.Months
+import com.dano.test1.MyApp
+import com.dano.test1.questionnaire.QuestionHandler
+import com.dano.test1.questionnaire.QuestionItem
+import com.dano.test1.R
+import com.dano.test1.utils.ViewUtils
+
+/*
+Zweck:
+Rendert eine Datumsfrage mit drei Spinnern (Tag/Monat/Jahr) innerhalb des Fragebogen-Flows.
+*/
 
 class HandlerDateSpinner(
     private val context: Context,
@@ -46,13 +57,12 @@ class HandlerDateSpinner(
         questionTextView.text = question.question?.let { LanguageManager.getText(languageID, it) } ?: ""
         textView.text = question.textKey?.let { LanguageManager.getText(languageID, it) } ?: ""
 
-        // —— Schriftgrößen pro Bildschirmhöhe ——
-        setTextSizePercentOfScreenHeight(textView,          0.03f) // oben
-        setTextSizePercentOfScreenHeight(questionTextView,  0.03f) // frage
-        setTextSizePercentOfScreenHeight(labelDay,          0.025f)
-        setTextSizePercentOfScreenHeight(labelMonth,        0.025f)
-        setTextSizePercentOfScreenHeight(labelYear,         0.025f)
-        // ————————————————————————————————
+        // Schriftgrößen pro Bildschirmhöhe
+        ViewUtils.setTextSizePercentOfScreenHeight(textView,          0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(questionTextView,  0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(labelDay,          0.025f)
+        ViewUtils.setTextSizePercentOfScreenHeight(labelMonth,        0.025f)
+        ViewUtils.setTextSizePercentOfScreenHeight(labelYear,         0.025f)
 
         // gespeicherte Antwort (YYYY-MM-DD) lesen
         val (savedYear, savedMonthIndex, savedDay) = question.question?.let {
@@ -70,9 +80,9 @@ class HandlerDateSpinner(
         val defaultYear = savedYear ?: today.get(Calendar.YEAR)
 
         // Spinner responsiv aufsetzen (Schrift + Zeilenhöhe ohne Abschneiden)
-        setupSpinner(spinnerDay, days, defaultDay)
-        setupSpinner(spinnerMonth, months, defaultMonth)
-        setupSpinner(spinnerYear, years, defaultYear)
+        ViewUtils.setupResponsiveSpinner(context, spinnerDay, days, defaultDay)
+        ViewUtils.setupResponsiveSpinner(context, spinnerMonth, months, defaultMonth)
+        ViewUtils.setupResponsiveSpinner(context, spinnerYear, years, defaultYear)
 
         // DB-Abfrage, falls noch nicht im answers-Map
         val answerMapKey = question.question ?: (question.id ?: "")
@@ -202,72 +212,4 @@ class HandlerDateSpinner(
         return sdf.parse(dateString)
     }
 
-    // —— Textgröße prozentual zur Bildschirmhöhe (in sp) ——
-    private fun setTextSizePercentOfScreenHeight(view: TextView, percentOfHeight: Float) {
-        val dm = (view.context ?: layout.context).resources.displayMetrics
-        val sp = (dm.heightPixels * percentOfHeight) / dm.scaledDensity
-        TextViewCompat.setAutoSizeTextTypeWithDefaults(view, TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE)
-        view.setTextSize(TypedValue.COMPLEX_UNIT_SP, sp)
-    }
-
-    // —— Spinner-Adapter: Schrift & Zeilenhöhe dynamisch, kein Abschneiden ——
-    private fun <T> setupSpinner(spinner: Spinner, items: List<T>, defaultSelection: T?) {
-        val dm = context.resources.displayMetrics
-
-        fun spFromScreenHeight(percent: Float): Float =
-            (dm.heightPixels * percent) / dm.scaledDensity
-        fun pxFromSp(sp: Float): Int = (sp * dm.scaledDensity).toInt()
-
-        val textSp    = spFromScreenHeight(0.0275f)              // ~2.75% der Bildschirmhöhe
-        val textPx    = pxFromSp(textSp)
-        val vPadPx    = (textPx * 0.50f).toInt()                 // vertikales Padding
-        val rowHeight = (textPx * 2.20f + 2 * vPadPx).toInt()    // feste Zeilenhöhe
-
-        val adapter = object : ArrayAdapter<T>(context, android.R.layout.simple_spinner_item, items) {
-            private fun styleRow(tv: TextView, forceHeight: Boolean) {
-                tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSp)
-                tv.includeFontPadding = true
-                tv.setLineSpacing(0f, 1.2f)
-                tv.gravity = (tv.gravity and android.view.Gravity.HORIZONTAL_GRAVITY_MASK) or android.view.Gravity.CENTER_VERTICAL
-                tv.setPadding(tv.paddingLeft, vPadPx, tv.paddingRight, vPadPx)
-                tv.minHeight = rowHeight
-                tv.isSingleLine = true
-                if (forceHeight) {
-                    val lp = tv.layoutParams
-                    if (lp == null || lp.height <= 0) {
-                        tv.layoutParams = AbsListView.LayoutParams(
-                            AbsListView.LayoutParams.MATCH_PARENT, rowHeight
-                        )
-                    } else {
-                        lp.height = rowHeight
-                    }
-                }
-            }
-
-            override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-                val v = super.getView(position, convertView, parent) as TextView
-                styleRow(v, forceHeight = false) // ausgewählte Ansicht
-                return v
-            }
-
-            override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
-                val v = super.getDropDownView(position, convertView, parent) as TextView
-                styleRow(v, forceHeight = true)  // Dropdown-Zeilen: Höhe erzwingen
-                return v
-            }
-        }
-
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        spinner.adapter = adapter
-
-        // Spinner selbst ausreichend hoch
-        spinner.setPadding(spinner.paddingLeft, vPadPx, spinner.paddingRight, vPadPx)
-        spinner.minimumHeight = rowHeight
-        spinner.requestLayout()
-
-        defaultSelection?.let {
-            val index = items.indexOf(it)
-            if (index >= 0) spinner.setSelection(index)
-        }
-    }
 }

app/src/main/java/com/dano/test1/questionnaire/handlers/HandlerGlassScaleQuestion.kt

@@ -1,13 +1,25 @@
-package com.dano.test1
+package com.dano.test1.questionnaire.handlers
 
 import android.content.Context
-import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
 import android.widget.*
-import androidx.core.widget.TextViewCompat
+import com.dano.test1.questionnaire.GlobalValues
+import com.dano.test1.LanguageManager
+import com.dano.test1.MyApp
+import com.dano.test1.questionnaire.QuestionHandler
+import com.dano.test1.questionnaire.QuestionItem
+import com.dano.test1.R
+import com.dano.test1.utils.ViewUtils
 import kotlinx.coroutines.*
 
+/*
+Zweck:
+- „Glas-Skala“-Frage: pro Symptom (Zeile) genau eine von fünf Stufen.
+- Stufen als RadioButtons (clickbar) + Icon-Header.
+- FIX: Pro Zeile wird Single-Select erzwungen (auch im Bearbeiten-Modus / Restore).
+*/
+
 class HandlerGlassScaleQuestion(
     private val context: Context,
     private val answers: MutableMap<String, Any>,
@@ -46,6 +58,9 @@ class HandlerGlassScaleQuestion(
         "extreme_glass"  to R.drawable.ic_glass_4
     )
 
+    // Damit wir beim programmatic-check keine Endlosschleifen triggern
+    private var suppressRowListener: Boolean = false
+
     override fun bind(layout: View, question: QuestionItem) {
         if (question !is QuestionItem.GlassScaleQuestion) return
         this.layout = layout
@@ -57,15 +72,16 @@ class HandlerGlassScaleQuestion(
         titleTv.text = question.textKey?.let { LanguageManager.getText(languageID, it) } ?: ""
         questionTv.text = question.question?.let { LanguageManager.getText(languageID, it) } ?: ""
 
-        setTextSizePercentOfScreenHeight(titleTv,    0.03f)
-        setTextSizePercentOfScreenHeight(questionTv, 0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(titleTv, 0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(questionTv, 0.03f)
 
-        // ----- feste Icon-Leiste -----
+        // Header Icons
         val header = layout.findViewById<LinearLayout>(R.id.glass_header)
         header.removeAllViews()
         header.addView(Space(context).apply {
             layoutParams = LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 4f)
         })
+
         val iconSizePx = (context.resources.displayMetrics.density * 36).toInt()
         scaleLabels.forEach { labelKey ->
             val cell = FrameLayout(context).apply {
@@ -80,13 +96,12 @@ class HandlerGlassScaleQuestion(
             cell.addView(img)
             header.addView(cell)
         }
-        // -----------------------------
 
         val tableLayout = layout.findViewById<TableLayout>(R.id.glass_table)
         tableLayout.removeAllViews()
         addSymptomRows(tableLayout)
 
-        // ggf. Antworten aus DB wiederherstellen
+        // Restore aus DB (nur wenn noch nicht im answers)
         val anySymptomNeedsRestore = question.symptoms.any { !answers.containsKey(it) }
         if (anySymptomNeedsRestore) {
             CoroutineScope(Dispatchers.IO).launch {
@@ -96,21 +111,14 @@ class HandlerGlassScaleQuestion(
                     val answerMap = allAnswersForClient.associateBy({ it.questionId }, { it.answerValue })
 
                     withContext(Dispatchers.Main) {
-                        val table = tableLayout
                         for ((index, symptomKey) in question.symptoms.withIndex()) {
                             val answerMapKey = "$questionnaireMeta-$symptomKey"
                             val dbAnswer = answerMap[answerMapKey]?.takeIf { it.isNotBlank() }?.trim()
                             if (!answers.containsKey(symptomKey) && !dbAnswer.isNullOrBlank()) {
-                                if (index < table.childCount) {
-                                    val row = table.getChildAt(index) as? TableRow ?: continue
+                                if (index < tableLayout.childCount) {
+                                    val row = tableLayout.getChildAt(index) as? TableRow ?: continue
                                     val radioGroup = row.getChildAt(1) as? RadioGroup ?: continue
-                                    for (i in 0 until radioGroup.childCount) {
-                                        val rb = getRadioFromChild(radioGroup.getChildAt(i)) ?: continue
-                                        if ((rb.tag as? String)?.trim() == dbAnswer) {
-                                            rb.isChecked = true
-                                            break
-                                        }
-                                    }
+                                    setSingleSelection(radioGroup, dbAnswer) // <-- FIXED restore
                                     answers[symptomKey] = dbAnswer
                                     points.add(pointsMap[dbAnswer] ?: 0)
                                 }
@@ -147,28 +155,63 @@ class HandlerGlassScaleQuestion(
                 text = LanguageManager.getText(languageID, symptomKey)
                 layoutParams = TableRow.LayoutParams(0, TableRow.LayoutParams.WRAP_CONTENT, 4f)
                 setPadding(4, 16, 4, 16)
-                setTextSizePercentOfScreenHeight(this, 0.022f)
+                ViewUtils.setTextSizePercentOfScreenHeight(this, 0.022f)
             }
             row.addView(symptomText)
 
             val radioGroup = RadioGroup(context).apply {
                 orientation = RadioGroup.HORIZONTAL
                 layoutParams = TableRow.LayoutParams(0, TableRow.LayoutParams.WRAP_CONTENT, 5f)
+                setPadding(0, 0, 0, 0)
             }
 
-            // WICHTIG: RadioButtons sind direkte Kinder des RadioGroup!
+            // Build buttons
             scaleLabels.forEach { labelKey ->
+                val cell = FrameLayout(context).apply {
+                    layoutParams = RadioGroup.LayoutParams(0, RadioGroup.LayoutParams.WRAP_CONTENT, 1f)
+                }
+
                 val rb = RadioButton(context).apply {
                     tag = labelKey
                     id = View.generateViewId()
-                    isChecked = savedLabel == labelKey
+                    isChecked = false
                     setPadding(0, 0, 0, 0)
                 }
-                val lp = RadioGroup.LayoutParams(
-                    0, RadioGroup.LayoutParams.WRAP_CONTENT, 1f
-                ).apply { gravity = Gravity.CENTER }
-                rb.layoutParams = lp
-                radioGroup.addView(rb)
+
+                rb.layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                    Gravity.CENTER
+                )
+
+                // <<< FIX: erzwinge pro Zeile genau eine Auswahl
+                rb.setOnCheckedChangeListener { buttonView, isChecked ->
+                    if (suppressRowListener) return@setOnCheckedChangeListener
+                    if (!isChecked) return@setOnCheckedChangeListener
+
+                    val selectedLabel = buttonView.tag as? String ?: return@setOnCheckedChangeListener
+                    // wenn einer checked -> alle anderen in dieser Row unchecken
+                    suppressRowListener = true
+                    try {
+                        for (i in 0 until radioGroup.childCount) {
+                            val other = getRadioFromChild(radioGroup.getChildAt(i)) ?: continue
+                            if (other != buttonView) other.isChecked = false
+                        }
+                    } finally {
+                        suppressRowListener = false
+                    }
+
+                    // Optional (wenn du willst): sofort im answers setzen (Edit-Mode fühlt sich dann "direkt" an)
+                    answers[symptomKey] = selectedLabel
+                }
+
+                cell.addView(rb)
+                radioGroup.addView(cell)
+            }
+
+            // Restore aus answers (falls vorhanden)
+            if (!savedLabel.isNullOrBlank()) {
+                setSingleSelection(radioGroup, savedLabel)
             }
 
             row.addView(radioGroup)
@@ -176,6 +219,22 @@ class HandlerGlassScaleQuestion(
         }
     }
 
+    /**
+     * Setzt in diesem Row-RadioGroup genau einen Wert aktiv und alle anderen aus.
+     */
+    private fun setSingleSelection(radioGroup: RadioGroup, labelKey: String) {
+        suppressRowListener = true
+        try {
+            for (i in 0 until radioGroup.childCount) {
+                val rb = getRadioFromChild(radioGroup.getChildAt(i)) ?: continue
+                val tag = (rb.tag as? String)?.trim()
+                rb.isChecked = (tag == labelKey.trim())
+            }
+        } finally {
+            suppressRowListener = false
+        }
+    }
+
     override fun validate(): Boolean {
         val table = layout.findViewById<TableLayout>(R.id.glass_table)
         for (i in 0 until table.childCount) {
@@ -203,6 +262,7 @@ class HandlerGlassScaleQuestion(
             val row = table.getChildAt(i) as TableRow
             val symptomKey = question.symptoms[i]
             val radioGroup = row.getChildAt(1) as RadioGroup
+
             for (j in 0 until radioGroup.childCount) {
                 val rb = getRadioFromChild(radioGroup.getChildAt(j)) ?: continue
                 if (rb.isChecked) {
@@ -215,7 +275,6 @@ class HandlerGlassScaleQuestion(
         }
     }
 
-    // --- Helpers ---
     private fun getRadioFromChild(child: View): RadioButton? =
         when (child) {
             is RadioButton -> child
@@ -223,10 +282,4 @@ class HandlerGlassScaleQuestion(
             else -> null
         }
 
-    private fun setTextSizePercentOfScreenHeight(view: TextView, percentOfHeight: Float) {
-        val dm = (view.context ?: layout.context).resources.displayMetrics
-        val sp = (dm.heightPixels * percentOfHeight) / dm.scaledDensity
-        TextViewCompat.setAutoSizeTextTypeWithDefaults(view, TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE)
-        view.setTextSize(TypedValue.COMPLEX_UNIT_SP, sp)
-    }
-}
+}

app/src/main/java/com/dano/test1/questionnaire/handlers/HandlerLastPage.kt

@@ -1,14 +1,35 @@
-package com.dano.test1
+package com.dano.test1.questionnaire.handlers
 
+import android.util.TypedValue
 import android.view.View
 import android.widget.*
 import android.text.Html
-import kotlinx.coroutines.*
-import android.util.TypedValue
-import android.widget.TextView
 import androidx.core.widget.TextViewCompat
+import kotlinx.coroutines.*
+import com.dano.test1.questionnaire.GlobalValues
+import com.dano.test1.LanguageManager
+import com.dano.test1.MainActivity
+import com.dano.test1.questionnaire.QuestionHandler
+import com.dano.test1.questionnaire.QuestionItem
+import com.dano.test1.R
+import com.dano.test1.utils.ViewUtils
 import com.google.android.material.button.MaterialButton
 
+/*
+Zweck:
+- Steuert die letzte Seite eines Fragebogens.
+- Zeigt Abschlusstexte an, speichert alle gesammelten Antworten in die lokale DB und beendet anschließend den Fragebogen und kehrt zur übergeordneten Ansicht zurück.
+
+Beim Klick auf „Speichern“:
+   - Ladezustand anzeigen (ProgressBar), Buttons deaktivieren.
+   - Antworten asynchron in Room-DB persistieren (über `saveAnswersToDatabase`).
+   - Punktsumme ermitteln und in `GlobalValues.INTEGRATION_INDEX` schreiben.
+   - `client_code` (falls vorhanden) als `GlobalValues.LAST_CLIENT_CODE` merken.
+   - Mindestens 2 Sekunden „Loading“-Dauer sicherstellen (ruhiges UX).
+   - Zurück auf den Main-Thread wechseln, UI entsperren und Fragebogen schließen.
+
+*/
+
 class HandlerLastPage(
     private val answers: Map<String, Any>,
     private val languageID: String,
@@ -19,7 +40,7 @@ class HandlerLastPage(
 
     private lateinit var currentQuestion: QuestionItem.LastPage
     private lateinit var layout: View
-    private val minLoadingTimeMs = 2000L  // Minimum loading time in milliseconds (2 seconds)
+    private val minLoadingTimeMs = 2000L
 
     override fun bind(layout: View, question: QuestionItem) {
         this.layout = layout
@@ -43,8 +64,8 @@ class HandlerLastPage(
         applyResponsiveTextSizing(finishBtn)
 
         // Überschriften responsiv skalieren (wie zuvor)
-        setTextSizePercentOfScreenHeight(titleTv,    0.03f)
-        setTextSizePercentOfScreenHeight(questionTv, 0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(titleTv,    0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(questionTv, 0.03f)
 
         // Buttons
         prevBtn.setOnClickListener { goToPreviousQuestion() }
@@ -61,27 +82,31 @@ class HandlerLastPage(
                 // Punkte summieren
                 GlobalValues.INTEGRATION_INDEX = sumPoints()
 
-                // Client-Code merken
+                // Client-Code merken (für Auto-Laden im Opening Screen)
                 val clientCode = answers["client_code"] as? String
-                if (clientCode != null) GlobalValues.LAST_CLIENT_CODE = clientCode
+                if (clientCode != null) {
+                    GlobalValues.LAST_CLIENT_CODE = clientCode
+                    GlobalValues.LOADED_CLIENT_CODE = clientCode   // <— zusätzlich setzen
+                }
 
-                // min. Ladezeit einhalten
+                // min. Ladezeit einhalten (ruhiges UX)
                 val elapsedTime = System.currentTimeMillis() - startTime
                 if (elapsedTime < minLoadingTimeMs) delay(minLoadingTimeMs - elapsedTime)
 
                 withContext(Dispatchers.Main) {
                     showLoading(false)
                     val activity = layout.context as? MainActivity
+                    // Zurück zum Opening Screen – der lädt dann automatisch (siehe Änderung 2)
                     activity?.finishQuestionnaire() ?: goToNextQuestion()
                 }
             }
         }
+
     }
 
     override fun validate(): Boolean = true
     override fun saveAnswer() {}
 
-    // ---------- Responsive Textgröße für den Finish-Button ----------
     private fun applyResponsiveTextSizing(btn: MaterialButton) {
         // Max-/Min-Sp anhand der Bildschirmhöhe (in sp) berechnen
         val dm = btn.resources.displayMetrics
@@ -109,14 +134,6 @@ class HandlerLastPage(
     }
     // ----------------------------------------------------------------
 
-    // Helper: Textgröße prozentual zur Bildschirmhöhe setzen (in sp)
-    private fun setTextSizePercentOfScreenHeight(view: TextView, percentOfHeight: Float) {
-        val dm = (view.context ?: layout.context).resources.displayMetrics
-        val sp = (dm.heightPixels * percentOfHeight) / dm.scaledDensity
-        TextViewCompat.setAutoSizeTextTypeWithDefaults(view, TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE)
-        view.setTextSize(TypedValue.COMPLEX_UNIT_SP, sp)
-    }
-
     private fun sumPoints(): Int =
         answers.filterKeys { it.endsWith("_points") }
             .values.mapNotNull { it as? Int }

app/src/main/java/com/dano/test1/questionnaire/handlers/HandlerMultiCheckboxQuestion.kt

@@ -1,11 +1,23 @@
-package com.dano.test1
+package com.dano.test1.questionnaire.handlers
 
 import android.content.Context
+import android.util.TypedValue
 import android.view.View
 import android.widget.*
-import kotlinx.coroutines.*
-import android.util.TypedValue
 import androidx.core.widget.TextViewCompat
+import kotlinx.coroutines.*
+import com.dano.test1.questionnaire.GlobalValues
+import com.dano.test1.LanguageManager
+import com.dano.test1.MyApp
+import com.dano.test1.questionnaire.QuestionHandler
+import com.dano.test1.questionnaire.QuestionItem
+import com.dano.test1.R
+import com.dano.test1.utils.ViewUtils
+
+/*
+Zweck:
+- Steuert eine Frage mit mehreren auswählbaren Antwortoptionen (Checkboxen).
+*/
 
 class HandlerMultiCheckboxQuestion(
     private val context: Context,
@@ -15,7 +27,7 @@ class HandlerMultiCheckboxQuestion(
     private val goToNextQuestion: () -> Unit,
     private val goToPreviousQuestion: () -> Unit,
     private val showToast: (String) -> Unit,
-    private val questionnaireMeta: String // neu: für DB-ID wie bei den anderen Handlern
+    private val questionnaireMeta: String //
 ) : QuestionHandler {
 
     private lateinit var layout: View
@@ -29,14 +41,12 @@ class HandlerMultiCheckboxQuestion(
         val questionTitle = layout.findViewById<TextView>(R.id.question)
         val questionTextView = layout.findViewById<TextView>(R.id.textView)
 
-        // Texte setzen
         questionTextView.text = this.question.textKey?.let { LanguageManager.getText(languageID, it) } ?: ""
         questionTitle.text = this.question.question?.let { LanguageManager.getText(languageID, it) } ?: ""
 
-        // ===== Textgrößen pro Bildschirmhöhe (wie bei deinen anderen Handlern) =====
-        setTextSizePercentOfScreenHeight(questionTextView, 0.03f)  // Überschrift
-        setTextSizePercentOfScreenHeight(questionTitle,    0.03f)  // Frage
-        // ==========================================================================
+        // Textgrößen pro Bildschirmhöhe (wie bei deinen anderen Handlern)
+        ViewUtils.setTextSizePercentOfScreenHeight(questionTextView, 0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(questionTitle,    0.03f)
 
         container.removeAllViews()
 
@@ -45,13 +55,12 @@ class HandlerMultiCheckboxQuestion(
             (answers[it] as? List<*>)?.map { it.toString() }?.toSet()
         } ?: emptySet()
 
-        // ——— Checkbox-Schrift & Zeilenhöhe dynamisch ableiten (kein Abschneiden) ———
+        // Checkbox-Schrift & Zeilenhöhe dynamisch ableiten (kein Abschneiden)
         val dm = layout.resources.displayMetrics
         val cbTextSp = (dm.heightPixels * 0.025f) / dm.scaledDensity // ~2.5% der Bildschirmhöhe
         val cbTextPx = cbTextSp * dm.scaledDensity
         val cbPadV   = (cbTextPx * 0.40f).toInt()
         val cbMinH   = (cbTextPx * 1.60f + 2 * cbPadV).toInt()
-        // ----------------------------------------------------------------------------
 
         this.question.options.forEach { option ->
             val checkBox = CheckBox(context).apply {
@@ -78,7 +87,7 @@ class HandlerMultiCheckboxQuestion(
             container.addView(checkBox)
         }
 
-        // --- DB-Abfrage falls noch kein Eintrag im answers-Map existiert ---
+        //DB-Abfrage falls noch kein Eintrag im answers-Map existiert
         val answerMapKey = question.question ?: (question.id ?: "")
         if (answerMapKey.isNotBlank() && !answers.containsKey(answerMapKey)) {
             CoroutineScope(Dispatchers.IO).launch {
@@ -100,7 +109,7 @@ class HandlerMultiCheckboxQuestion(
                                 cb.isChecked = parsed.contains(cb.tag.toString())
                             }
 
-                            // answers-Map aktualisieren (Liste)
+                            // answers-Map aktualisieren
                             answers[answerMapKey] = parsed.toList()
 
                             // Punkte berechnen und hinzufügen
@@ -175,16 +184,8 @@ class HandlerMultiCheckboxQuestion(
         }
     }
 
-    /**
-     * Parsen der DB-Antwort in ein Set von Keys. Unterstützt:
-     * - JSON-Array: ["a","b"]
-     * - kommasepariert: a,b
-     * - semikolon-separiert: a;b
-     * - einzelner Wert: a
-     */
     private fun parseMultiAnswer(dbAnswer: String): Set<String> {
         val trimmed = dbAnswer.trim()
-        // JSON-Array-like
         if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
             val inner = trimmed.substring(1, trimmed.length - 1)
             if (inner.isBlank()) return emptySet()
@@ -194,7 +195,6 @@ class HandlerMultiCheckboxQuestion(
                 .toSet()
         }
 
-        // If contains comma or semicolon
         val separator = when {
             trimmed.contains(",") -> ","
             trimmed.contains(";") -> ";"
@@ -211,11 +211,4 @@ class HandlerMultiCheckboxQuestion(
         }
     }
 
-    // Helper: Textgröße prozentual zur Bildschirmhöhe setzen
-    private fun setTextSizePercentOfScreenHeight(view: TextView, percentOfHeight: Float) {
-        val dm = (view.context ?: layout.context).resources.displayMetrics
-        val sp = (dm.heightPixels * percentOfHeight) / dm.scaledDensity
-        TextViewCompat.setAutoSizeTextTypeWithDefaults(view, TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE)
-        view.setTextSize(TypedValue.COMPLEX_UNIT_SP, sp)
-    }
 }

app/src/main/java/com/dano/test1/questionnaire/handlers/HandlerRadioQuestion.kt

@@ -1,12 +1,22 @@
-package com.dano.test1
+package com.dano.test1.questionnaire.handlers
 
 import android.content.Context
 import android.view.View
 import android.text.Html
 import android.widget.*
 import kotlinx.coroutines.*
-import android.util.TypedValue
-import androidx.core.widget.TextViewCompat    // <— hinzugefügt
+import com.dano.test1.questionnaire.GlobalValues
+import com.dano.test1.LanguageManager
+import com.dano.test1.MyApp
+import com.dano.test1.questionnaire.QuestionHandler
+import com.dano.test1.questionnaire.QuestionItem
+import com.dano.test1.R
+import com.dano.test1.utils.ViewUtils
+
+/*
+Zweck:
+- Steuert eine Einzelfrage mit genau einer auswählbaren Antwort (RadioButtons).
+*/
 
 class HandlerRadioQuestion(
     private val context: Context,
@@ -36,11 +46,8 @@ class HandlerRadioQuestion(
             Html.fromHtml(LanguageManager.getText(languageID, it), Html.FROM_HTML_MODE_LEGACY)
         } ?: ""
 
-        // === Schriftgrößen wie im HandlerClientCoachCode ===
-        // Titel/Frage: 3% der Bildschirmhöhe
-        setTextSizePercentOfScreenHeight(questionTextView, 0.03f)
-        setTextSizePercentOfScreenHeight(questionTitle,   0.03f)
-        // ===================================================
+        ViewUtils.setTextSizePercentOfScreenHeight(questionTextView, 0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(questionTitle,   0.03f)
 
         radioGroup.removeAllViews()
 
@@ -50,7 +57,7 @@ class HandlerRadioQuestion(
                 tag = option.key
 
                 // RadioButton-Text analog zu EditTexts: 2.5% der Bildschirmhöhe
-                setTextSizePercentOfScreenHeight(this, 0.025f)
+                ViewUtils.setTextSizePercentOfScreenHeight(this, 0.025f)
 
                 layoutParams = RadioGroup.LayoutParams(
                     RadioGroup.LayoutParams.MATCH_PARENT,
@@ -132,15 +139,6 @@ class HandlerRadioQuestion(
         }
     }
 
-    // ——— Helper: setzt Textgröße prozentual zur Bildschirmhöhe (in sp) ———
-    private fun setTextSizePercentOfScreenHeight(view: TextView, percentOfHeight: Float) {
-        val dm = (view.context ?: layout.context).resources.displayMetrics
-        val sp = (dm.heightPixels * percentOfHeight) / dm.scaledDensity
-        TextViewCompat.setAutoSizeTextTypeWithDefaults(view, TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE)
-        view.setTextSize(TypedValue.COMPLEX_UNIT_SP, sp)
-    }
-    // ————————————————————————————————————————————————————————————————
-
     private fun restorePreviousAnswer(radioGroup: RadioGroup) {
         question.question?.let { questionKey ->
             val savedAnswer = answers[questionKey] as? String

app/src/main/java/com/dano/test1/questionnaire/handlers/HandlerStringSpinner.kt

@@ -0,0 +1,126 @@
+package com.dano.test1.questionnaire.handlers
+
+import android.content.Context
+import android.view.View
+import android.widget.*
+import kotlinx.coroutines.*
+import com.dano.test1.ui.Countries
+import com.dano.test1.questionnaire.GlobalValues
+import com.dano.test1.LanguageManager
+import com.dano.test1.MyApp
+import com.dano.test1.questionnaire.QuestionHandler
+import com.dano.test1.questionnaire.QuestionItem
+import com.dano.test1.R
+import com.dano.test1.utils.ViewUtils
+
+/*
+Zweck:
+- Steuert eine Frage mit einer einzelnen Auswahl aus einer Dropdown-Liste (Spinner).
+- Baut die Optionen dynamisch auf, lokalisiert Texte, stellt responsive Typografie her und kann vorhandene Antworten aus der lokalen Room-DB restaurieren.
+*/
+
+class HandlerStringSpinner(
+    private val context: Context,
+    private val answers: MutableMap<String, Any>,
+    private val languageID: String,
+    private val goToNextQuestion: () -> Unit,
+    private val goToPreviousQuestion: () -> Unit,
+    private val showToast: (String) -> Unit,
+    private val questionnaireMeta: String
+) : QuestionHandler {
+
+    private lateinit var layout: View
+    private lateinit var question: QuestionItem.StringSpinnerQuestion
+
+    override fun bind(layout: View, question: QuestionItem) {
+        if (question !is QuestionItem.StringSpinnerQuestion) return
+
+        this.layout = layout
+        this.question = question
+
+        val questionTextView = layout.findViewById<TextView>(R.id.question)
+        val textView = layout.findViewById<TextView>(R.id.textView)
+        val spinner = layout.findViewById<Spinner>(R.id.string_spinner)
+
+        // Texte setzen
+        questionTextView.text = question.question?.let { LanguageManager.getText(languageID, it) } ?: ""
+        textView.text = question.textKey?.let { LanguageManager.getText(languageID, it) } ?: ""
+
+        // Textgrößen prozentual zur Bildschirmhöhe
+        ViewUtils.setTextSizePercentOfScreenHeight(textView,         0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(questionTextView, 0.03f)
+
+        val options = buildOptionsList()
+
+        // vorhandene Auswahl (falls vorhanden)
+        val savedSelection = question.question?.let { answers[it] as? String }
+
+        // Spinner aufsetzen
+        ViewUtils.setupResponsiveSpinner(context, spinner, options, savedSelection)
+
+        // Falls noch keine Antwort im Map: aus DB laden
+        val answerMapKey = question.question ?: (question.id ?: "")
+        if (answerMapKey.isNotBlank() && !answers.containsKey(answerMapKey)) {
+            CoroutineScope(Dispatchers.IO).launch {
+                try {
+                    val clientCode = GlobalValues.LAST_CLIENT_CODE
+                    if (clientCode.isNullOrBlank()) return@launch
+
+                    val allAnswersForClient = MyApp.database.answerDao().getAnswersForClient(clientCode)
+                    val myQuestionId = questionnaireMeta + "-" + question.question
+                    val dbAnswer = allAnswersForClient.find { it.questionId == myQuestionId }?.answerValue
+
+                    if (!dbAnswer.isNullOrBlank()) {
+                        withContext(Dispatchers.Main) {
+                            answers[answerMapKey] = dbAnswer
+                            val index = options.indexOf(dbAnswer)
+                            if (index >= 0) spinner.setSelection(index)
+                        }
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+
+        layout.findViewById<Button>(R.id.Qnext).setOnClickListener {
+            if (validate()) {
+                saveAnswer()
+                goToNextQuestion()
+            }
+        }
+
+        layout.findViewById<Button>(R.id.Qprev).setOnClickListener {
+            goToPreviousQuestion()
+        }
+    }
+
+    override fun validate(): Boolean {
+        val spinner = layout.findViewById<Spinner>(R.id.string_spinner)
+        val selected = spinner.selectedItem as? String
+        val prompt = LanguageManager.getText(languageID, "choose_answer")
+
+        return if (selected.isNullOrEmpty() || selected == prompt) {
+            showToast(LanguageManager.getText(languageID, "select_one_answer"))
+            false
+        } else {
+            true
+        }
+    }
+
+    override fun saveAnswer() {
+        val spinner = layout.findViewById<Spinner>(R.id.string_spinner)
+        val selected = spinner.selectedItem as? String ?: return
+        question.question?.let { key -> answers[key] = selected }
+    }
+
+    private fun buildOptionsList(): List<String> {
+        return if (question.id == "q11") {
+            Countries.getAllCountries(languageID)
+        } else {
+            val prompt = LanguageManager.getText(languageID, "choose_answer")
+            listOf(prompt) + question.options
+        }
+    }
+
+}

app/src/main/java/com/dano/test1/questionnaire/handlers/HandlerValueSpinner.kt

@@ -1,12 +1,24 @@
-package com.dano.test1
+package com.dano.test1.questionnaire.handlers
 
 import android.content.Context
 import android.view.View
-import android.view.ViewGroup
 import android.widget.*
 import kotlinx.coroutines.*
-import android.util.TypedValue
-import androidx.core.widget.TextViewCompat   // <- NEU
+import com.dano.test1.questionnaire.GlobalValues
+import com.dano.test1.LanguageManager
+import com.dano.test1.MyApp
+import com.dano.test1.questionnaire.QuestionHandler
+import com.dano.test1.questionnaire.QuestionItem
+import com.dano.test1.R
+import com.dano.test1.utils.ViewUtils
+
+/*
+Zweck:
+- Steuert eine Frage, bei der ein numerischer Wert aus einem Spinner gewählt wird.
+- Unterstützt sowohl feste Optionslisten als auch numerische Bereiche (min..max).
+- Lokalisiert Texte, kann eine frühere Antwort aus der lokalen Room-DB (per AnswerDao) wiederherstellen.
+
+*/
 
 class HandlerValueSpinner(
     private val context: Context,
@@ -16,7 +28,7 @@ class HandlerValueSpinner(
     private val goToPreviousQuestion: () -> Unit,
     private val goToQuestionById: (String) -> Unit,
     private val showToast: (String) -> Unit,
-    private val questionnaireMeta: String // neu: für die DB-Abfrage
+    private val questionnaireMeta: String
 ) : QuestionHandler {
 
     private lateinit var layout: View
@@ -35,11 +47,8 @@ class HandlerValueSpinner(
         questionTextView.text = question.question?.let { LanguageManager.getText(languageID, it) } ?: ""
         textView.text = question.textKey?.let { LanguageManager.getText(languageID, it) } ?: ""
 
-        // === Schriftgrößen wie im HandlerRadioQuestion ===
-        // Titel/Frage: 3% der Bildschirmhöhe
-        setTextSizePercentOfScreenHeight(textView,          0.03f)
-        setTextSizePercentOfScreenHeight(questionTextView,  0.03f)
-        // =================================================
+        ViewUtils.setTextSizePercentOfScreenHeight(textView,          0.03f)
+        ViewUtils.setTextSizePercentOfScreenHeight(questionTextView,  0.03f)
 
         val prompt = LanguageManager.getText(languageID, "choose_answer")
         val spinnerItems: List<String> = listOf(prompt) + if (question.range != null) {
@@ -49,9 +58,9 @@ class HandlerValueSpinner(
         }
 
         val savedValue = question.question?.let { answers[it] as? String }
-        setupSpinner(spinner, spinnerItems, savedValue)
+        ViewUtils.setupResponsiveSpinner(context, spinner, spinnerItems, savedValue)
 
-        // --- DB-Abfrage falls noch keine Antwort im Map existiert ---
+        //DB-Abfrage falls noch keine Antwort im Map existiert
         val answerMapKey = question.question ?: (question.id ?: "")
         if (answerMapKey.isNotBlank() && !answers.containsKey(answerMapKey)) {
             CoroutineScope(Dispatchers.IO).launch {
@@ -120,73 +129,4 @@ class HandlerValueSpinner(
         }
     }
 
-    // ——— Helper: setzt Textgröße prozentual zur Bildschirmhöhe (in sp) ———
-    private fun setTextSizePercentOfScreenHeight(view: TextView, percentOfHeight: Float) {
-        val dm = (view.context ?: layout.context).resources.displayMetrics
-        val sp = (dm.heightPixels * percentOfHeight) / dm.scaledDensity
-        TextViewCompat.setAutoSizeTextTypeWithDefaults(view, TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE)
-        view.setTextSize(TypedValue.COMPLEX_UNIT_SP, sp)
-    }
-    // ————————————————————————————————————————————————————————————————
-
-    private fun <T> setupSpinner(spinner: Spinner, items: List<T>, selectedItem: T?) {
-        val dm = context.resources.displayMetrics
-
-        fun spFromScreenHeight(percent: Float): Float =
-            (dm.heightPixels * percent) / dm.scaledDensity
-        fun pxFromSp(sp: Float): Int = (sp * dm.scaledDensity).toInt()
-
-        // Schrift & abgeleitete Höhen
-        val textSp    = spFromScreenHeight(0.0275f)        // ~2.75% der Bildschirmhöhe
-        val textPx    = pxFromSp(textSp)
-        val vPadPx    = (textPx * 0.50f).toInt()           // vertikales Padding
-        val rowHeight = (textPx * 2.20f + 2 * vPadPx).toInt() // feste Zeilenhöhe
-
-        val adapter = object : ArrayAdapter<T>(context, android.R.layout.simple_spinner_item, items) {
-            private fun styleRow(tv: TextView, forceHeight: Boolean) {
-                tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSp)
-                tv.includeFontPadding = true
-                tv.setLineSpacing(0f, 1.2f)
-                tv.gravity = (tv.gravity and android.view.Gravity.HORIZONTAL_GRAVITY_MASK) or android.view.Gravity.CENTER_VERTICAL
-                tv.setPadding(tv.paddingLeft, vPadPx, tv.paddingRight, vPadPx)
-                tv.minHeight = rowHeight
-                tv.isSingleLine = true
-                if (forceHeight) {
-                    val lp = tv.layoutParams
-                    if (lp == null || lp.height <= 0) {
-                        tv.layoutParams = AbsListView.LayoutParams(
-                            AbsListView.LayoutParams.MATCH_PARENT, rowHeight
-                        )
-                    } else {
-                        lp.height = rowHeight
-                    }
-                }
-            }
-
-            override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-                val v = super.getView(position, convertView, parent) as TextView
-                styleRow(v, forceHeight = false) // ausgewählte Ansicht
-                return v
-            }
-
-            override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
-                val v = super.getDropDownView(position, convertView, parent) as TextView
-                styleRow(v, forceHeight = true)  // Dropdown-Zeilen: Höhe erzwingen
-                return v
-            }
-        }
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        spinner.adapter = adapter
-
-        // Spinner selbst ausreichend hoch machen
-        spinner.setPadding(spinner.paddingLeft, vPadPx, spinner.paddingRight, vPadPx)
-        spinner.minimumHeight = rowHeight
-        spinner.requestLayout()
-
-        selectedItem?.let {
-            val index = items.indexOf(it)
-            if (index >= 0) spinner.setSelection(index)
-        }
-    }
-
 }

app/src/main/java/com/dano/test1/ui/CountriesSpinner.kt

@@ -1,4 +1,6 @@
-package com.dano.test1
+package com.dano.test1.ui
+
+import com.dano.test1.LanguageManager
 
 object Countries {
     fun getAllCountries(languageID: String): List<String> {

app/src/main/java/com/dano/test1/ui/DatabaseButtonHandler.kt

@@ -1,13 +1,21 @@
-package com.dano.test1
+package com.dano.test1.ui
 
+import android.graphics.Color
+import android.graphics.Typeface
 import android.util.Log
 import android.view.View
 import android.widget.*
+import com.dano.test1.data.ExcelExportService
+import com.dano.test1.utils.ViewUtils
+import com.dano.test1.LanguageManager
+import com.dano.test1.MainActivity
+import com.dano.test1.MyApp
+import com.dano.test1.R
 import com.dano.test1.data.Client
+import com.dano.test1.data.HeaderOrderRepository
 import com.dano.test1.data.Question
 import com.dano.test1.data.Questionnaire
 import kotlinx.coroutines.*
-import kotlin.math.roundToInt
 import org.json.JSONArray
 
 class DatabaseButtonHandler(
@@ -361,7 +369,7 @@ class DatabaseButtonHandler(
         val row = TableRow(activity).apply {
             isClickable = true
             isFocusable = true
-            setBackgroundColor(android.graphics.Color.TRANSPARENT)
+            setBackgroundColor(Color.TRANSPARENT)
             setOnClickListener { onClick() }
         }
         cells.forEachIndexed { index, text ->
@@ -396,7 +404,7 @@ class DatabaseButtonHandler(
             this.text = text
             setPadding(dp(12), dp(10), dp(12), dp(10))
             textSize = 16f
-            setTypeface(typeface, android.graphics.Typeface.BOLD)
+            setTypeface(typeface, Typeface.BOLD)
         }
 
     private fun makeBodyCell(
@@ -412,10 +420,7 @@ class DatabaseButtonHandler(
             bgColor?.let { setBackgroundColor(it) }
         }
 
-    private fun dp(value: Int): Int {
-        val density = activity.resources.displayMetrics.density
-        return (value * density).roundToInt()
-    }
+    private fun dp(value: Int): Int = ViewUtils.dp(activity, value)
 
     private fun <T : View> requireView(id: Int, name: String): T {
         val v = activity.findViewById<T>(id)

app/src/main/java/com/dano/test1/ui/EditButtonHandler.kt

@@ -1,10 +1,14 @@
-package com.dano.test1
+package com.dano.test1.ui
 
 import android.widget.Button
 import android.widget.EditText
 import android.widget.Toast
+import com.dano.test1.LanguageManager
+import com.dano.test1.MainActivity
+import com.dano.test1.MyApp
 import kotlinx.coroutines.*
 import com.dano.test1.data.CompletedQuestionnaire
+import com.dano.test1.questionnaire.GlobalValues
 
 class EditButtonHandler(
     private val activity: MainActivity,

app/src/main/java/com/dano/test1/ui/HandlerOpeningScreen.kt

@@ -1,18 +1,34 @@
-package com.dano.test1
+package com.dano.test1.ui
 
+import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Color
+import android.graphics.drawable.GradientDrawable
 import android.os.Handler
 import android.os.Looper
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
 import android.widget.*
+import com.dano.test1.LanguageManager
+import com.dano.test1.MainActivity
+import com.dano.test1.R
+import com.dano.test1.network.DatabaseUploader
+import com.dano.test1.network.LoginManager
+import com.dano.test1.network.NetworkUtils
+import com.dano.test1.network.TokenStore
+import com.dano.test1.questionnaire.GlobalValues
+import com.dano.test1.questionnaire.QuestionItem
+import com.dano.test1.questionnaire.QuestionnaireBase
+import com.dano.test1.questionnaire.QuestionnaireGeneric
 import com.google.android.material.button.MaterialButton
 import org.json.JSONArray
 import org.json.JSONObject
 import java.io.File
 import java.util.concurrent.TimeUnit
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.dano.test1.utils.ViewUtils
+
 
 var RHS_POINTS: Int? = null
 
@@ -32,6 +48,8 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
     private lateinit var databaseButton: Button
     private lateinit var statusSession: TextView
     private lateinit var statusOnline: TextView
+    private val SESSION_WARN_AFTER_MS = 12 * 60 * 60 * 1000L // 12h
+    private var sessionLongWarnedOnce = false
 
     private val dynamicButtons = mutableListOf<Button>()
     private val questionnaireFiles = mutableMapOf<Button, String>()
@@ -63,6 +81,11 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
 
     fun init() {
         activity.setContentView(R.layout.opening_screen)
+
+        // <<< NEU: bei jedem Öffnen des Screens zurücksetzen,
+        // damit der Toast pro Besuch einmal angezeigt wird
+        sessionLongWarnedOnce = false
+
         bindViews()
         loadQuestionnaireOrder()
         createQuestionnaireButtons()
@@ -82,9 +105,14 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
 
         val pathExists = File("/data/data/com.dano.test1/databases/questionnaire_database").exists()
         updateMainButtonsState(pathExists)
-        updateDownloadButtonState(pathExists) // <<< NEU: Download-Button anhand DB-Status setzen
+        updateDownloadButtonState(pathExists)
 
         if (pathExists && !editText.text.isNullOrBlank()) buttonLoad.performClick()
+
+        uiHandler.removeCallbacks(statusTicker)
+        updateStatusStrip()
+        applySessionAgeHighlight(System.currentTimeMillis() - TokenStore.getLoginTimestamp(activity))
+        uiHandler.post(statusTicker)
     }
 
     private fun bindViews() {
@@ -97,7 +125,10 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         saveButton = activity.findViewById(R.id.saveButton)
         editButton = activity.findViewById(R.id.editButton)
         uploadButton = activity.findViewById(R.id.uploadButton)
+
         downloadButton = activity.findViewById(R.id.downloadButton)
+        downloadButton.visibility = View.GONE
+
         databaseButton = activity.findViewById(R.id.databaseButton)
         statusSession = activity.findViewById(R.id.statusSession)
         statusOnline = activity.findViewById(R.id.statusOnline)
@@ -255,18 +286,21 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
     }
 
     private fun restorePreviousClientCode() {
+        // Coach-Code (Username) setzen und Feld sperren – aber NICHT mehr zurückkehren
         val username = TokenStore.getUsername(activity)
         if (!username.isNullOrBlank()) {
             coachEditText.setText(username)
             lockCoachCodeField()
-            return
         }
+
+        // Hier den zuletzt verwendeten Client-Code einsetzen
         GlobalValues.LAST_CLIENT_CODE?.let {
             editText.setText(it)
             GlobalValues.LOADED_CLIENT_CODE = it
         }
     }
 
+
     private fun setupLanguageSpinner() {
         val languages = listOf("GERMAN", "ENGLISH", "FRENCH", "ROMANIAN", "ARABIC", "POLISH", "TURKISH", "UKRAINIAN", "RUSSIAN", "SPANISH")
         val adapter = ArrayAdapter(activity, android.R.layout.simple_spinner_item, languages).apply {
@@ -441,13 +475,47 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
     private fun setupUploadButton() {
         uploadButton.text = t("upload")
         uploadButton.setOnClickListener {
-            val token = TokenStore.getToken(activity)
-            if (token.isNullOrBlank()) {
-                Toast.makeText(activity, t("login_required"), Toast.LENGTH_LONG).show()
-                return@setOnClickListener
+            // ZUERST bestätigen lassen
+            confirmUpload {
+                // === dein bestehender Upload-Code unverändert ===
+                val existingToken = TokenStore.getToken(activity)
+                val ageMs = System.currentTimeMillis() - TokenStore.getLoginTimestamp(activity)
+                val isFresh = !existingToken.isNullOrBlank() && ageMs < 23 * 60 * 60 * 1000
+
+                if (isFresh) {
+                    GlobalValues.LAST_CLIENT_CODE = editText.text.toString().trim()
+                    DatabaseUploader.uploadDatabaseWithToken(activity, existingToken!!)
+                    return@confirmUpload
+                }
+
+                val username = TokenStore.getUsername(activity)?.trim().orEmpty()
+                if (username.isBlank()) {
+                    Toast.makeText(activity, t("login_required"), Toast.LENGTH_LONG).show()
+                    return@confirmUpload
+                }
+
+                val password = when (username) {
+                    "user01" -> "pw1"
+                    "user02" -> "pw2"
+                    else -> {
+                        Toast.makeText(activity, t("login_required"), Toast.LENGTH_LONG).show()
+                        return@confirmUpload
+                    }
+                }
+
+                LoginManager.loginUserWithCredentials(
+                    context = activity,
+                    username = username,
+                    password = password,
+                    onSuccess = { freshToken ->
+                        GlobalValues.LAST_CLIENT_CODE = editText.text.toString().trim()
+                        DatabaseUploader.uploadDatabaseWithToken(activity, freshToken)
+                    },
+                    onError = { msg ->
+                        Toast.makeText(activity, t("login_failed_with_reason").replace("{reason}", msg), Toast.LENGTH_LONG).show()
+                    }
+                )
             }
-            GlobalValues.LAST_CLIENT_CODE = editText.text.toString().trim()
-            DatabaseUploader.uploadDatabaseWithToken(activity, token)
         }
     }
 
@@ -482,7 +550,6 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         // Der Download-Button wird separat gesteuert
     }
 
-    /** <<< NEU: Steuert Aktivierung & Look des Download-Buttons je nach DB-Verfügbarkeit */
     private fun updateDownloadButtonState(isDatabaseAvailable: Boolean) {
         val mb = downloadButton as? MaterialButton
         if (isDatabaseAvailable) {
@@ -506,7 +573,7 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         }
     }
 
-    private fun dp(v: Int): Int = (v * activity.resources.displayMetrics.density).toInt()
+    private fun dp(v: Int): Int = ViewUtils.dp(activity, v)
 
     private fun isCompleted(button: Button): Boolean {
         val fileName = questionnaireFiles[button] ?: return false
@@ -579,13 +646,18 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         val h = TimeUnit.MILLISECONDS.toHours(ageMs)
         val m = TimeUnit.MILLISECONDS.toMinutes(ageMs) - h * 60
         if (ts > 0L) {
-            statusSession.text = "${t("session_label")}: ${h}${t("hours_short")} ${m}${t("minutes_short")}"
+            // ⚠️ anhängen, wenn >12h, der eigentliche Hinweis/Styling kommt aus applySessionAgeHighlight()
+            val warn = if (ageMs >= SESSION_WARN_AFTER_MS) "  ⚠️" else ""
+            statusSession.text = "${t("session_label")}: ${h}${t("hours_short")} ${m}${t("minutes_short")}$warn"
         } else {
             statusSession.text = t("session_dash")
         }
         val online = NetworkUtils.isOnline(activity)
         statusOnline.text = if (online) t("online") else t("offline")
         statusOnline.setTextColor(if (online) Color.parseColor("#2E7D32") else Color.parseColor("#C62828"))
+
+        // <<< NEU: hier jeweils prüfen/markieren
+        applySessionAgeHighlight(ageMs)
     }
 
     fun refreshHeaderStatusLive() {
@@ -593,15 +665,60 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
     }
 
     private fun lockCoachCodeField() {
-        coachEditText.isFocusable = false
-        coachEditText.isFocusableInTouchMode = false
-        coachEditText.isCursorVisible = false
-        coachEditText.keyListener = null
-        coachEditText.isLongClickable = false
-        coachEditText.isClickable = false
-        coachEditText.setBackgroundResource(R.drawable.bg_field_locked)
-        coachEditText.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_24, 0)
-        coachEditText.compoundDrawablePadding = dp(8)
-        coachEditText.alpha = 0.95f
+        ViewUtils.lockEditField(coachEditText)
     }
+
+    private fun applySessionAgeHighlight(ageMs: Long) {
+        val isOld = ageMs >= SESSION_WARN_AFTER_MS
+        if (isOld) {
+            statusSession.setTextColor(Color.parseColor("#C62828"))
+            statusSession.setBackgroundColor(Color.parseColor("#FFF3CD"))
+            statusSession.setPadding(dp(8), dp(4), dp(8), dp(4))
+            if (!sessionLongWarnedOnce) {
+                showRedToast(activity, t("session_over_12"))
+                sessionLongWarnedOnce = true
+            }
+        } else {
+            statusSession.setTextColor(Color.parseColor("#2F2A49"))
+            statusSession.setBackgroundColor(Color.TRANSPARENT)
+            statusSession.setPadding(0, 0, 0, 0)
+        }
+    }
+
+
+
+    private fun showRedToast(ctx: Context, message: String) {
+        val tv = TextView(ctx).apply {
+            text = message
+            setTextColor(Color.WHITE)
+            textSize = 16f
+            setPadding(32, 20, 32, 20)
+            background = GradientDrawable().apply {
+                shape = GradientDrawable.RECTANGLE
+                cornerRadius = 24f
+                setColor(Color.parseColor("#D32F2F")) // kräftiges Rot
+            }
+        }
+        Toast(ctx).apply {
+            duration = Toast.LENGTH_LONG
+            view = tv
+            setGravity(Gravity.TOP or Gravity.CENTER_HORIZONTAL, 0, 120)
+        }.show()
+    }
+
+    private fun confirmUpload(onConfirm: () -> Unit) {
+        MaterialAlertDialogBuilder(activity)
+            .setTitle(t("start_upload"))
+            .setMessage(t("ask_before_upload"))
+            .setPositiveButton(t("ok")) { d, _ ->
+                d.dismiss()
+                onConfirm()
+            }
+            .setNegativeButton(t("cancel")) { d, _ ->
+                d.dismiss()
+            }
+            .show()
+    }
+
+
 }

app/src/main/java/com/dano/test1/ui/LoadButtonHandler.kt

@@ -1,10 +1,15 @@
-package com.dano.test1
+package com.dano.test1.ui
 
 import android.widget.Button
 import android.widget.EditText
 import android.widget.Toast
+import com.dano.test1.LanguageManager
+import com.dano.test1.MainActivity
+import com.dano.test1.MyApp
 import kotlinx.coroutines.*
 import com.dano.test1.data.CompletedQuestionnaire
+import com.dano.test1.questionnaire.GlobalValues
+import com.dano.test1.questionnaire.QuestionItem
 
 class LoadButtonHandler(
     private val activity: MainActivity,

app/src/main/java/com/dano/test1/ui/MonthsSpinner.kt

@@ -1,4 +1,6 @@
-package com.dano.test1
+package com.dano.test1.ui
+
+import com.dano.test1.LanguageManager
 
 data class Month(val name: String) {
     override fun toString(): String = name

app/src/main/java/com/dano/test1/ui/SaveButtonHandler.kt

@@ -1,12 +1,21 @@
-package com.dano.test1
+package com.dano.test1.ui
 
+import android.content.ActivityNotFoundException
+import android.content.ContentUris
+import android.content.ContentValues
+import android.content.Intent
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.pdf.PdfDocument
+import android.provider.MediaStore
 import android.util.Log
 import android.widget.Button
 import android.widget.EditText
 import android.widget.Toast
+import com.dano.test1.LanguageManager
+import com.dano.test1.MainActivity
+import com.dano.test1.MyApp
+import com.dano.test1.questionnaire.GlobalValues
 import kotlinx.coroutines.*
 
 class SaveButtonHandler(
@@ -105,19 +114,19 @@ class SaveButtonHandler(
             val resolver = activity.contentResolver
 
             val deleteIfExists: (String) -> Unit = { name ->
-                val projection = arrayOf(android.provider.MediaStore.MediaColumns._ID)
-                val selection = "${android.provider.MediaStore.MediaColumns.DISPLAY_NAME} = ?"
+                val projection = arrayOf(MediaStore.MediaColumns._ID)
+                val selection = "${MediaStore.MediaColumns.DISPLAY_NAME} = ?"
                 val selectionArgs = arrayOf(name)
                 val query = resolver.query(
-                    android.provider.MediaStore.Downloads.EXTERNAL_CONTENT_URI,
+                    MediaStore.Downloads.EXTERNAL_CONTENT_URI,
                     projection, selection, selectionArgs, null
                 )
                 query?.use { cursor ->
                     if (cursor.moveToFirst()) {
-                        val idColumn = cursor.getColumnIndexOrThrow(android.provider.MediaStore.MediaColumns._ID)
+                        val idColumn = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns._ID)
                         val id = cursor.getLong(idColumn)
-                        val deleteUri = android.content.ContentUris.withAppendedId(
-                            android.provider.MediaStore.Downloads.EXTERNAL_CONTENT_URI, id
+                        val deleteUri = ContentUris.withAppendedId(
+                            MediaStore.Downloads.EXTERNAL_CONTENT_URI, id
                         )
                         resolver.delete(deleteUri, null, null)
                     }
@@ -129,20 +138,20 @@ class SaveButtonHandler(
 
             try {
                 val pdfUri = resolver.insert(
-                    android.provider.MediaStore.Downloads.EXTERNAL_CONTENT_URI,
-                    android.content.ContentValues().apply {
-                        put(android.provider.MediaStore.MediaColumns.DISPLAY_NAME, pdfFileName)
-                        put(android.provider.MediaStore.MediaColumns.MIME_TYPE, "application/pdf")
-                        put(android.provider.MediaStore.MediaColumns.RELATIVE_PATH, "Download/")
+                    MediaStore.Downloads.EXTERNAL_CONTENT_URI,
+                    ContentValues().apply {
+                        put(MediaStore.MediaColumns.DISPLAY_NAME, pdfFileName)
+                        put(MediaStore.MediaColumns.MIME_TYPE, "application/pdf")
+                        put(MediaStore.MediaColumns.RELATIVE_PATH, "Download/")
                     }
                 )
 
                 val csvUri = resolver.insert(
-                    android.provider.MediaStore.Downloads.EXTERNAL_CONTENT_URI,
-                    android.content.ContentValues().apply {
-                        put(android.provider.MediaStore.MediaColumns.DISPLAY_NAME, csvFileName)
-                        put(android.provider.MediaStore.MediaColumns.MIME_TYPE, "text/csv")
-                        put(android.provider.MediaStore.MediaColumns.RELATIVE_PATH, "Download/")
+                    MediaStore.Downloads.EXTERNAL_CONTENT_URI,
+                    ContentValues().apply {
+                        put(MediaStore.MediaColumns.DISPLAY_NAME, csvFileName)
+                        put(MediaStore.MediaColumns.MIME_TYPE, "text/csv")
+                        put(MediaStore.MediaColumns.RELATIVE_PATH, "Download/")
                     }
                 )
 
@@ -162,13 +171,13 @@ class SaveButtonHandler(
                     Toast.makeText(activity, msg, Toast.LENGTH_LONG).show()
 
                     pdfUri?.let {
-                        val intent = android.content.Intent(android.content.Intent.ACTION_VIEW).apply {
+                        val intent = Intent(Intent.ACTION_VIEW).apply {
                             setDataAndType(it, "application/pdf")
-                            addFlags(android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION or android.content.Intent.FLAG_ACTIVITY_NO_HISTORY)
+                            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NO_HISTORY)
                         }
                         try {
                             activity.startActivity(intent)
-                        } catch (e: android.content.ActivityNotFoundException) {
+                        } catch (e: ActivityNotFoundException) {
                             val noViewer = LanguageManager.getText(languageIDProvider(), "no_pdf_viewer")
                             Toast.makeText(activity, noViewer, Toast.LENGTH_SHORT).show()
                         }

app/src/main/java/com/dano/test1/utils/AES256Helper.kt

@@ -1,4 +1,3 @@
-// app/src/main/java/com/dano/test1/AES256Helper.kt
 package com.dano.test1
 
 import java.io.File
@@ -11,7 +10,6 @@ import kotlin.math.min
 
 object AES256Helper {
 
-    // HKDF-SHA256: IKM = tokenHex->bytes, salt="", info="qdb-aes", len=32
     private fun hkdfFromToken(tokenHex: String, info: String = "qdb-aes", len: Int = 32): ByteArray {
         val ikm = hexToBytes(tokenHex)
         val mac = Mac.getInstance("HmacSHA256")

app/src/main/java/com/dano/test1/utils/LanguageManager.kt

@@ -1,6 +1,8 @@
 package com.dano.test1
 
-import java.util.Calendar
+import com.dano.test1.questionnaire.MAX_VALUE_AGE
+import com.dano.test1.questionnaire.MAX_VALUE_YEAR
+import com.dano.test1.ui.RHS_POINTS
 
 object LanguageManager {
     fun getTextFormatted(languageId: String, key: String, vararg args: Any): String {
@@ -61,14 +63,14 @@ object LanguageManager {
             "once"                                to "einmal",
             "year_after_2000"                     to "Das Jahr muss nach 2000 liegen!",
             "year_after_departure"                to "Das Jahr muss nach dem Verlassen des Herkunftslandes liegen!",
-            "year_max"                            to "Das Jahr muss kleiner oder gleich $MAX_VALUE_YEAR sein!",
+            "year_max"                            to "Das Jahr muss kleiner oder gleich ${MAX_VALUE_YEAR} sein!",
             "data_final_warning"                  to "<b><font color='#FF0000'>Wichtig:</font></b> Die Daten können nach dem Abschluss nicht mehr verändert oder bearbeitet werden!",
             "multiple_times"                      to "mehrmals",
             "more_than_15_years"                  to "mehr als 15 Jahre",
             "no"                                  to "Nein",
             "no_answer"                           to "keine Angabe",
             "other_country"                       to "anderes Land",
-            "value_must_be_less_equal_max"        to "Der Wert muss kleiner oder gleich $MAX_VALUE_AGE sein!",
+            "value_must_be_less_equal_max"        to "Der Wert muss kleiner oder gleich ${MAX_VALUE_AGE} sein!",
             "value_between_1_and_15"              to "Der Wert muss zwischen 1 und 15 liegen!",
             "invalid_month"                       to "Ungültige Monatsangabe!",
             "invalid_year"                        to "Ungültige Jahresangabe!",
@@ -400,7 +402,12 @@ object LanguageManager {
             "done"                        to "Erledigt",
             "not_done"                    to "Nicht erledigt",
             "none"                        to "Keine",
-            "view_missing"                to "Fehlende View: %s"
+            "view_missing"                to "Fehlende View: %s",
+            "session_over_12"             to "Sitzung läuft länger als 12 Stunden.",
+            "cancel"                      to "Cancel",
+            "ok"                          to "OK",
+            "ask_before_upload"           to "Möchtest du den Upload wirklich ausführen?",
+            "start_upload"                to "Upload starten?"
         ),
 
         "ENGLISH" to mapOf(
@@ -433,14 +440,14 @@ object LanguageManager {
             "once"                               to "once",
             "year_after_2000"                   to "The year must be after 2000!",
             "year_after_departure"              to "The year must be after leaving the country of origin!",
-            "year_max"                          to "The year must be less than or equal to $MAX_VALUE_YEAR!",
+            "year_max"                          to "The year must be less than or equal to ${MAX_VALUE_YEAR}!",
             "data_final_warning"                to "<b><font color='#FF0000'>Important:</font></b> The data cannot be changed or edited after completion!",
             "multiple_times"                    to "multiple times",
             "more_than_15_years"                to "more than 15 years",
             "no"                                 to "No",
             "no_answer"                          to "No answer",
             "other_country"                     to "Other country",
-            "value_must_be_less_equal_max"      to "The value must be less than or equal to $MAX_VALUE_AGE!",
+            "value_must_be_less_equal_max"      to "The value must be less than or equal to ${MAX_VALUE_AGE}!",
             "value_between_1_and_15"            to "The value must be between 1 and 15!",
             "invalid_month"                     to "Invalid month!",
             "invalid_year"                      to "Invalid year!",
@@ -771,7 +778,12 @@ object LanguageManager {
             "done"                        to "Done",
             "not_done"                    to "Not done",
             "none"                        to "None",
-            "view_missing"                to "Missing view: %s"
+            "view_missing"                to "Missing view: %s",
+            "session_over_12"   to "Session has been running for more than 12 hours.",
+            "cancel"            to "Cancel",
+            "ok"                to "OK",
+            "ask_before_upload" to "Do you really want to perform the upload?",
+            "start_upload"      to "Start upload?"
         ),
 
         "FRENCH" to mapOf(
@@ -804,14 +816,14 @@ object LanguageManager {
             "once"                                to "une fois",
             "year_after_2000"                     to "L’année doit être après 2000 !",
             "year_after_departure"                to "L’année doit être après le départ du pays d’origine !",
-            "year_max"                            to "L’année doit être inférieure ou égale à $MAX_VALUE_YEAR !",
+            "year_max"                            to "L’année doit être inférieure ou égale à ${MAX_VALUE_YEAR} !",
             "data_final_warning"                  to "<b><font color='#FF0000'>Important :</font></b> Les données ne peuvent plus être modifiées ou éditées après la validation !",
             "multiple_times"                      to "plusieurs fois",
             "more_than_15_years"                  to "plus de 15 ans",
             "no"                                  to "Non",
             "no_answer"                           to "pas de réponse",
             "other_country"                       to "autre pays",
-            "value_must_be_less_equal_max"        to "La valeur doit être inférieure ou égale à $MAX_VALUE_AGE !",
+            "value_must_be_less_equal_max"        to "La valeur doit être inférieure ou égale à ${MAX_VALUE_AGE} !",
             "value_between_1_and_15"              to "La valeur doit être comprise entre 1 et 15 !",
             "invalid_month"                       to "Mois invalide !",
             "invalid_year"                        to "Année invalide !",
@@ -1146,7 +1158,12 @@ object LanguageManager {
             "done"                        to "Terminé",
             "not_done"                    to "Non terminé",
             "none"                        to "Aucun",
-            "view_missing"                to "Vue manquante : %s"
+            "view_missing"                to "Vue manquante : %s",
+            "session_over_12"   to "La session dure depuis plus de 12 heures.",
+            "cancel"            to "Annuler",
+            "ok"                to "OK",
+            "ask_before_upload" to "Voulez-vous vraiment effectuer le téléversement ?",
+            "start_upload"      to "Démarrer le téléversement ?"
         ),
 
         "RUSSIAN" to mapOf(
@@ -1179,14 +1196,14 @@ object LanguageManager {
             "once"                                to "один раз",
             "year_after_2000"                     to "Год должен быть после 2000!",
             "year_after_departure"                to "Год должен быть после даты выезда из страны происхождения!",
-            "year_max"                            to "Год должен быть меньше или равен $MAX_VALUE_YEAR!",
+            "year_max"                            to "Год должен быть меньше или равен ${MAX_VALUE_YEAR}!",
             "data_final_warning"                  to "<b><font color='#FF0000'>Внимание:</font></b> Данные нельзя изменять после завершения!",
             "multiple_times"                      to "несколько раз",
             "more_than_15_years"                  to "более 15 лет",
             "no"                                  to "Нет",
             "no_answer"                           to "без ответа",
             "other_country"                       to "другая страна",
-            "value_must_be_less_equal_max"        to "Значение должно быть меньше или равно $MAX_VALUE_AGE!",
+            "value_must_be_less_equal_max"        to "Значение должно быть меньше или равно ${MAX_VALUE_AGE}!",
             "value_between_1_and_15"              to "Значение должно быть между 1 и 15!",
             "invalid_month"                       to "Недопустимый месяц!",
             "invalid_year"                        to "Недопустимый год!",
@@ -1517,7 +1534,12 @@ object LanguageManager {
             "done"                        to "Готово",
             "not_done"                    to "Не выполнено",
             "none"                        to "Нет",
-            "view_missing"                to "Отсутствует представление: %s"
+            "view_missing"                to "Отсутствует представление: %s",
+            "session_over_12"   to "Сеанс продолжается более 12 часов.",
+            "cancel"            to "Отмена",
+            "ok"                to "OK",
+            "ask_before_upload" to "Вы действительно хотите выполнить загрузку?",
+            "start_upload"      to "Начать загрузку?"
         ),
 
         "UKRAINIAN" to mapOf(
@@ -1550,14 +1572,14 @@ object LanguageManager {
             "once"                                to "один раз",
             "year_after_2000"                     to "Рік має бути після 2000!",
             "year_after_departure"                to "Рік має бути після виїзду з країни походження!",
-            "year_max"                            to "Рік має бути меншим або рівним $MAX_VALUE_YEAR!",
+            "year_max"                            to "Рік має бути меншим або рівним ${MAX_VALUE_YEAR}!",
             "data_final_warning"                  to "<b><font color='#FF0000'>Важливо:</font></b> Дані після завершення не можна змінити або редагувати!",
             "multiple_times"                      to "багато разів",
             "more_than_15_years"                  to "більше 15 років",
             "no"                                  to "Ні",
             "no_answer"                           to "немає відповіді",
             "other_country"                       to "інша країна",
-            "value_must_be_less_equal_max"        to "Значення має бути меншим або рівним $MAX_VALUE_AGE!",
+            "value_must_be_less_equal_max"        to "Значення має бути меншим або рівним ${MAX_VALUE_AGE}!",
             "value_between_1_and_15"              to "Значення має бути від 1 до 15!",
             "invalid_month"                       to "Неправильний місяць!",
             "invalid_year"                        to "Неправильний рік!",
@@ -1892,7 +1914,12 @@ object LanguageManager {
             "done"                        to "Готово",
             "not_done"                    to "Не виконано",
             "none"                        to "Немає",
-            "view_missing"                to "Відсутній елемент інтерфейсу: %s"
+            "view_missing"                to "Відсутній елемент інтерфейсу: %s",
+            "session_over_12"   to "Сеанс триває понад 12 годин.",
+            "cancel"            to "Скасувати",
+            "ok"                to "OK",
+            "ask_before_upload" to "Ви справді хочете виконати завантаження?",
+            "start_upload"      to "Почати завантаження?"
         ),
 
         "TURKISH" to mapOf(
@@ -1925,14 +1952,14 @@ object LanguageManager {
             "once"                                to "bir kez",
             "year_after_2000"                     to "Yıl 2000’den sonra olmalıdır!",
             "year_after_departure"                to "Yıl, menşe ülkeyi terk ettikten sonra olmalıdır!",
-            "year_max"                            to "Yıl $MAX_VALUE_YEAR’den küçük veya ona eşit olmalıdır!",
+            "year_max"                            to "Yıl ${MAX_VALUE_YEAR}’den küçük veya ona eşit olmalıdır!",
             "data_final_warning"                  to "<b><font color='#FF0000'>Önemli:</font></b> Veriler tamamlandıktan sonra değiştirilemez veya düzenlenemez!",
             "multiple_times"                      to "birden fazla kez",
             "more_than_15_years"                  to "15 yıldan fazla",
             "no"                                  to "Hayır",
             "no_answer"                           to "Cevap yok",
             "other_country"                       to "diğer ülke",
-            "value_must_be_less_equal_max"        to "Değer $MAX_VALUE_AGE’den küçük veya ona eşit olmalıdır!",
+            "value_must_be_less_equal_max"        to "Değer ${MAX_VALUE_AGE}’den küçük veya ona eşit olmalıdır!",
             "value_between_1_and_15"              to "Değer 1 ile 15 arasında olmalıdır!",
             "invalid_month"                       to "Geçersiz ay girişi!",
             "invalid_year"                        to "Geçersiz yıl girişi!",
@@ -2267,7 +2294,12 @@ object LanguageManager {
             "done"                        to "Tamamlandı",
             "not_done"                    to "Tamamlanmadı",
             "none"                        to "Yok",
-            "view_missing"                to "Eksik görünüm: %s"
+            "view_missing"                to "Eksik görünüm: %s",
+            "session_over_12"   to "Oturum 12 saatten uzun süredir açık.",
+            "cancel"            to "İptal",
+            "ok"                to "Tamam",
+            "ask_before_upload" to "Yüklemeyi gerçekten yapmak istiyor musunuz?",
+            "start_upload"      to "Yüklemeyi başlat?"
         ),
 
         "POLISH" to mapOf(
@@ -2300,14 +2332,14 @@ object LanguageManager {
             "once"                                to "jeden raz",
             "year_after_2000"                     to "Rok musi być po 2000!",
             "year_after_departure"                to "Rok musi być po opuszczeniu kraju pochodzenia!",
-            "year_max"                            to "Rok musi być mniejszy lub równy $MAX_VALUE_YEAR!",
+            "year_max"                            to "Rok musi być mniejszy lub równy ${MAX_VALUE_YEAR}!",
             "data_final_warning"                  to "<b><font color='#FF0000'>Ważne:</font></b> Po zakończeniu dane nie mogą być zmienione ani edytowane!",
             "multiple_times"                      to "kilka razy",
             "more_than_15_years"                  to "więcej niż 15 lat",
             "no"                                  to "Nie",
             "no_answer"                           to "brak odpowiedzi",
             "other_country"                       to "inny kraj",
-            "value_must_be_less_equal_max"        to "Wartość musi być mniejsza lub równa $MAX_VALUE_AGE!",
+            "value_must_be_less_equal_max"        to "Wartość musi być mniejsza lub równa ${MAX_VALUE_AGE}!",
             "value_between_1_and_15"              to "Wartość musi być między 1 a 15!",
             "invalid_month"                       to "Nieprawidłowy miesiąc!",
             "invalid_year"                        to "Nieprawidłowy rok!",
@@ -2642,7 +2674,12 @@ object LanguageManager {
             "done"                        to "Zrobione",
             "not_done"                    to "Niezrobione",
             "none"                        to "Brak",
-            "view_missing"                to "Brak widoku: %s"
+            "view_missing"                to "Brak widoku: %s",
+            "session_over_12"   to "Sesja trwa dłużej niż 12 godzin.",
+            "cancel"            to "Anuluj",
+            "ok"                to "OK",
+            "ask_before_upload" to "Czy na pewno chcesz wykonać przesyłanie?",
+            "start_upload"      to "Rozpocząć przesyłanie?"
         ),
 
         "ARABIC" to mapOf(
@@ -2675,14 +2712,14 @@ object LanguageManager {
             "once"                                to "مرة واحدة",
             "year_after_2000"                     to "يجب أن تكون السنة بعد 2000!",
             "year_after_departure"                to "يجب أن تكون السنة بعد مغادرة بلد المنشأ!",
-            "year_max"                            to "يجب أن تكون السنة أقل من أو تساوي $MAX_VALUE_YEAR!",
+            "year_max"                            to "يجب أن تكون السنة أقل من أو تساوي ${MAX_VALUE_YEAR}!",
             "data_final_warning"                  to "<b><font color='#FF0000'>هام:</font></b> لا يمكن تعديل البيانات بعد الانتهاء!",
             "multiple_times"                      to "عدة مرات",
             "more_than_15_years"                  to "أكثر من 15 سنة",
             "no"                                  to "لا",
             "no_answer"                           to "لا يوجد إجابة",
             "other_country"                       to "بلد آخر",
-            "value_must_be_less_equal_max"        to "يجب أن تكون القيمة أقل من أو تساوي $MAX_VALUE_AGE!",
+            "value_must_be_less_equal_max"        to "يجب أن تكون القيمة أقل من أو تساوي ${MAX_VALUE_AGE}!",
             "value_between_1_and_15"              to "يجب أن تكون القيمة بين 1 و15!",
             "invalid_month"                       to "شهر غير صالح!",
             "invalid_year"                        to "سنة غير صالحة!",
@@ -3017,7 +3054,12 @@ object LanguageManager {
             "done"                        to "منجز",
             "not_done"                    to "غير منجز",
             "none"                        to "لا شيء",
-            "view_missing"                to "العنصر المفقود: %s"
+            "view_missing"                to "العنصر المفقود: %s",
+            "session_over_12"   to "تعمل الجلسة منذ أكثر من 12 ساعة.",
+            "cancel"            to "إلغاء",
+            "ok"                to "موافق",
+            "ask_before_upload" to "هل ترغب فعلًا في تنفيذ الرفع؟",
+            "start_upload"      to "بدء الرفع؟"
         ),
 
         "ROMANIAN" to mapOf(
@@ -3050,14 +3092,14 @@ object LanguageManager {
             "once"                                to "o dată",
             "year_after_2000"                     to "Anul trebuie să fie după 2000!",
             "year_after_departure"                to "Anul trebuie să fie după plecarea din țara de origine!",
-            "year_max"                            to "Anul trebuie să fie mai mic sau egal cu $MAX_VALUE_YEAR!",
+            "year_max"                            to "Anul trebuie să fie mai mic sau egal cu ${MAX_VALUE_YEAR}!",
             "data_final_warning"                  to "<b><font color='#FF0000'>Important:</font></b> Datele nu mai pot fi modificate după finalizare!",
             "multiple_times"                      to "de mai multe ori",
             "more_than_15_years"                  to "mai mult de 15 ani",
             "no"                                  to "Nu",
             "no_answer"                           to "fără răspuns",
             "other_country"                       to "altă țară",
-            "value_must_be_less_equal_max"        to "Valoarea trebuie să fie mai mică sau egală cu $MAX_VALUE_AGE!",
+            "value_must_be_less_equal_max"        to "Valoarea trebuie să fie mai mică sau egală cu ${MAX_VALUE_AGE}!",
             "value_between_1_and_15"              to "Valoarea trebuie să fie între 1 și 15!",
             "invalid_month"                       to "Lună invalidă!",
             "invalid_year"                        to "An invalid!",
@@ -3392,7 +3434,12 @@ object LanguageManager {
             "done"                        to "Finalizat",
             "not_done"                    to "Nefinalizat",
             "none"                        to "Nimic",
-            "view_missing"                to "Vizualizare lipsă: %s"
+            "view_missing"                to "Vizualizare lipsă: %s",
+            "session_over_12"   to "Sesiunea rulează de mai bine de 12 ore.",
+            "cancel"            to "Anulează",
+            "ok"                to "OK",
+            "ask_before_upload" to "Vrei într-adevăr să efectuezi încărcarea?",
+            "start_upload"      to "Pornești încărcarea?"
         ),
 
         "SPANISH" to mapOf(
@@ -3425,14 +3472,14 @@ object LanguageManager {
             "once"                                to "una vez",
             "year_after_2000"                     to "¡El año debe ser posterior al 2000!",
             "year_after_departure"                to "¡El año debe ser posterior a la salida de su país de origen!",
-            "year_max"                            to "¡El año debe ser menor o igual que $MAX_VALUE_YEAR!",
+            "year_max"                            to "¡El año debe ser menor o igual que ${MAX_VALUE_YEAR}!",
             "data_final_warning"                  to "<b><font color='#FF0000'>Importante:</font></b> Después de finalizar, los datos no podrán cambiarse o editarse.",
             "multiple_times"                      to "varias veces",
             "more_than_15_years"                  to "más de 15 años",
             "no"                                  to "No",
             "no_answer"                           to "sin respuesta",
             "other_country"                       to "otro país",
-            "value_must_be_less_equal_max"        to "¡El valor debe ser menor o igual que $MAX_VALUE_AGE!",
+            "value_must_be_less_equal_max"        to "¡El valor debe ser menor o igual que ${MAX_VALUE_AGE}!",
             "value_between_1_and_15"              to "¡El valor debe estar entre 1 y 15!",
             "invalid_month"                       to "¡Mes no válido!",
             "invalid_year"                        to "¡Año no válido!",
@@ -3767,7 +3814,12 @@ object LanguageManager {
             "done"                        to "Completado",
             "not_done"                    to "No completado",
             "none"                        to "Ninguno",
-            "view_missing"                to "Vista faltante: %s"
+            "view_missing"                to "Vista faltante: %s",
+            "session_over_12"   to "La sesión lleva más de 12 horas.",
+            "cancel"            to "Cancelar",
+            "ok"                to "OK",
+            "ask_before_upload" to "¿Realmente deseas realizar la carga?",
+            "start_upload"      to "¿Iniciar la carga?"
         )
     )
 }

app/src/main/java/com/dano/test1/utils/ViewUtils.kt

@@ -0,0 +1,110 @@
+package com.dano.test1.utils
+
+import android.content.Context
+import android.util.TypedValue
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AbsListView
+import android.widget.ArrayAdapter
+import android.widget.EditText
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.core.widget.TextViewCompat
+import com.dano.test1.R
+import kotlin.math.roundToInt
+
+object ViewUtils {
+
+    /**
+     * Sets the text size of a TextView to a percentage of the screen height (in sp).
+     * Disables auto-sizing to prevent conflicts.
+     */
+    fun setTextSizePercentOfScreenHeight(view: TextView, percentOfHeight: Float) {
+        val dm = view.context.resources.displayMetrics
+        val sp = (dm.heightPixels * percentOfHeight) / dm.scaledDensity
+        TextViewCompat.setAutoSizeTextTypeWithDefaults(view, TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE)
+        view.setTextSize(TypedValue.COMPLEX_UNIT_SP, sp)
+    }
+
+    /**
+     * Sets up a Spinner with a responsive, styled adapter.
+     * Font size and row height are derived from screen height to prevent clipping.
+     */
+    fun <T> setupResponsiveSpinner(context: Context, spinner: Spinner, items: List<T>, selectedItem: T?) {
+        val dm = context.resources.displayMetrics
+
+        fun spFromScreenHeight(percent: Float): Float = (dm.heightPixels * percent) / dm.scaledDensity
+        fun pxFromSp(sp: Float): Int = (sp * dm.scaledDensity).toInt()
+
+        val textSp    = spFromScreenHeight(0.0275f)
+        val textPx    = pxFromSp(textSp)
+        val vPadPx    = (textPx * 0.50f).toInt()
+        val rowHeight = (textPx * 2.20f + 2 * vPadPx).toInt()
+
+        val adapter = object : ArrayAdapter<T>(context, android.R.layout.simple_spinner_item, items) {
+            private fun styleRow(tv: TextView, forceHeight: Boolean) {
+                tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSp)
+                tv.includeFontPadding = true
+                tv.setLineSpacing(0f, 1.2f)
+                tv.gravity = (tv.gravity and Gravity.HORIZONTAL_GRAVITY_MASK) or Gravity.CENTER_VERTICAL
+                tv.setPadding(tv.paddingLeft, vPadPx, tv.paddingRight, vPadPx)
+                tv.minHeight = rowHeight
+                tv.isSingleLine = true
+                if (forceHeight) {
+                    val lp = tv.layoutParams
+                    if (lp == null || lp.height <= 0) {
+                        tv.layoutParams = AbsListView.LayoutParams(AbsListView.LayoutParams.MATCH_PARENT, rowHeight)
+                    } else {
+                        lp.height = rowHeight
+                    }
+                }
+            }
+
+            override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+                val v = super.getView(position, convertView, parent) as TextView
+                styleRow(v, forceHeight = false)
+                return v
+            }
+
+            override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
+                val v = super.getDropDownView(position, convertView, parent) as TextView
+                styleRow(v, forceHeight = true)
+                return v
+            }
+        }
+
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinner.adapter = adapter
+        spinner.setPadding(spinner.paddingLeft, vPadPx, spinner.paddingRight, vPadPx)
+        spinner.minimumHeight = rowHeight
+        spinner.requestLayout()
+
+        selectedItem?.let {
+            val index = items.indexOf(it)
+            if (index >= 0) spinner.setSelection(index)
+        }
+    }
+
+    /**
+     * Locks an EditText field visually and functionally (e.g. for coach code fields).
+     */
+    fun lockEditField(field: EditText, dpPadding: Int = 8) {
+        field.isFocusable = false
+        field.isFocusableInTouchMode = false
+        field.isCursorVisible = false
+        field.keyListener = null
+        field.isLongClickable = false
+        field.isClickable = false
+        field.setBackgroundResource(R.drawable.bg_field_locked)
+        field.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_24, 0)
+        field.compoundDrawablePadding = dp(field.context, dpPadding)
+        field.alpha = 0.95f
+    }
+
+    /**
+     * Converts dp to pixels using the given context.
+     */
+    fun dp(context: Context, value: Int): Int =
+        (value * context.resources.displayMetrics.density).roundToInt()
+}

app/src/main/res/layout/client_coach_code_question.xml

@@ -5,9 +5,14 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    tools:layout_editor_absoluteX="11dp"
-    tools:layout_editor_absoluteY="107dp">
+    tools:context=".MainActivity">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="32dp" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qprev"
@@ -27,7 +32,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!-- Weiter -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qnext"
         android:layout_width="@dimen/nav_btn_size"
@@ -46,6 +50,34 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:layout_constraintTop_toBottomOf="@id/gTop"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
+
+    <TextView
+        android:id="@+id/question"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@id/textView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
+
     <EditText
         android:id="@+id/client_code"
         android:layout_width="0dp"
@@ -54,7 +86,7 @@
         app:layout_constraintHeight_percent="0.08"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/question"
+        app:layout_constraintTop_toBottomOf="@id/question"
         android:layout_marginTop="16dp"
         android:background="@android:drawable/edit_text"
         android:ems="10"
@@ -90,34 +122,4 @@
         android:autoSizeMaxTextSize="36sp"
         android:autoSizeStepGranularity="2sp" />
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.051"
-        app:layout_constraintWidth_percent="0.9" />
-
-    <TextView
-        android:id="@+id/question"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
-        app:layout_constraintHorizontal_bias="0.512"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView"
-        app:layout_constraintVertical_bias="0.0"
-        app:layout_constraintWidth_percent="0.9" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/date_spinner.xml

@@ -1,39 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <!-- Obere Überschrift -->
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="32dp" />
+
     <TextView
         android:id="@+id/textView"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:layout_constraintTop_toBottomOf="@id/gTop"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.051"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.9" />
 
-    <!-- Frage -->
     <TextView
         android:id="@+id/question"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
-        app:layout_constraintHorizontal_bias="0.512"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@id/textView"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView"
-        app:layout_constraintVertical_bias="0.0"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.9" />
 
     <TextView
@@ -129,7 +132,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!-- Weiter -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qnext"
         android:layout_width="@dimen/nav_btn_size"

app/src/main/res/layout/glass_scale_question.xml

@@ -1,41 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <!-- Titel -->
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="32dp" />
+
     <TextView
         android:id="@+id/textView"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:layout_constraintTop_toBottomOf="@id/gTop"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.051"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.9" />
 
-    <!-- Leitfrage -->
     <TextView
         android:id="@+id/question"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
-        app:layout_constraintStart_toStartOf="parent"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
         app:layout_constraintTop_toBottomOf="@id/textView"
-        app:layout_constraintVertical_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.9" />
 
-    <!-- FIXE ICON-LEISTE (bleibt stehen) -->
     <LinearLayout
         android:id="@+id/glass_header"
         android:layout_width="0dp"
@@ -48,7 +51,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="1" />
 
-    <!-- Scrollbarer Bereich NUR für Symptome + Kreise -->
     <ScrollView
         android:id="@+id/glassScroll"
         android:layout_width="0dp"
@@ -73,15 +75,12 @@
             android:textStyle="bold" />
     </ScrollView>
 
-    <!-- Buttons unten -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qprev"
         android:layout_width="@dimen/nav_btn_size"
         android:layout_height="@dimen/nav_btn_size"
         android:layout_marginStart="20dp"
         android:layout_marginBottom="16dp"
-        android:text=""
-        android:textAllCaps="false"
         app:icon="@drawable/ic_chevron_left"
         app:iconTint="@color/btn_nav_left_icon_tint"
         app:iconSize="@dimen/nav_icon_size"
@@ -92,15 +91,12 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!-- Weiter -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qnext"
         android:layout_width="@dimen/nav_btn_size"
         android:layout_height="@dimen/nav_btn_size"
         android:layout_marginEnd="20dp"
         android:layout_marginBottom="16dp"
-        android:text=""
-        android:textAllCaps="false"
         app:icon="@drawable/ic_chevron_right"
         app:iconTint="@color/btn_nav_right_icon_tint"
         app:iconSize="@dimen/nav_icon_size"

app/src/main/res/layout/multi_check_box_question.xml

@@ -5,9 +5,14 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    tools:layout_editor_absoluteX="11dp"
-    tools:layout_editor_absoluteY="107dp">
+    tools:context=".MainActivity">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="32dp" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qprev"
@@ -27,7 +32,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!-- Weiter -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qnext"
         android:layout_width="@dimen/nav_btn_size"
@@ -46,7 +50,34 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <!-- ScrollView füllt den Raum zwischen Frage und Buttons -->
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:layout_constraintTop_toBottomOf="@id/gTop"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
+
+    <TextView
+        android:id="@+id/question"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@id/textView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
+
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="0dp"
@@ -56,8 +87,8 @@
         android:layout_marginBottom="8dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/question"
-        app:layout_constraintBottom_toTopOf="@+id/Qnext"
+        app:layout_constraintTop_toBottomOf="@id/question"
+        app:layout_constraintBottom_toTopOf="@id/Qnext"
         app:layout_constraintWidth_percent="0.9">
 
         <LinearLayout
@@ -68,32 +99,4 @@
             android:padding="16dp" />
     </ScrollView>
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.051"
-        app:layout_constraintWidth_percent="0.9" />
-
-    <TextView
-        android:id="@+id/question"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
-        app:layout_constraintHorizontal_bias="0.512"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView"
-        app:layout_constraintVertical_bias="0.0"
-        app:layout_constraintWidth_percent="0.9" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/radio_question.xml

@@ -5,11 +5,15 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    tools:layout_editor_absoluteX="11dp"
-    tools:layout_editor_absoluteY="107dp">
+    tools:context=".MainActivity">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="32dp" />
 
-    <!-- Zurück -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qprev"
         android:layout_width="@dimen/nav_btn_size"
@@ -28,7 +32,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!-- Weiter -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qnext"
         android:layout_width="@dimen/nav_btn_size"
@@ -47,10 +50,34 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:layout_constraintTop_toBottomOf="@id/gTop"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
 
+    <TextView
+        android:id="@+id/question"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@id/textView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
 
-    <!-- SCROLLBEREICH für die Radio-Optionen:
-         füllt den Platz zwischen Frage und Buttons, scrollt bei Bedarf -->
     <ScrollView
         android:id="@+id/radioScroll"
         android:layout_width="0dp"
@@ -65,7 +92,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.80">
 
-        <!-- Die RadioGroup bleibt gleich, ist jetzt aber scrollfähig -->
         <RadioGroup
             android:id="@+id/RadioGroup"
             android:layout_width="match_parent"
@@ -74,33 +100,4 @@
             android:padding="8dp" />
     </ScrollView>
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.051"
-        app:layout_constraintWidth_percent="0.9" />
-
-    <TextView
-        android:id="@+id/question"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
-        app:layout_constraintHorizontal_bias="0.512"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView"
-        app:layout_constraintVertical_bias="0.0"
-        app:layout_constraintWidth_percent="0.9" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/string_spinner.xml

@@ -5,6 +5,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="32dp" />
+
     <Spinner
         android:id="@+id/string_spinner"
         android:layout_width="0dp"
@@ -33,7 +40,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!-- Weiter -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qnext"
         android:layout_width="@dimen/nav_btn_size"
@@ -55,30 +61,29 @@
     <TextView
         android:id="@+id/textView"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:layout_constraintTop_toBottomOf="@id/gTop"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.051"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.9" />
 
     <TextView
         android:id="@+id/question"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
-        app:layout_constraintHorizontal_bias="0.512"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@id/textView"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView"
-        app:layout_constraintVertical_bias="0.0"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.9" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/value_spinner.xml

@@ -5,6 +5,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="32dp" />
+
     <Spinner
         android:id="@+id/value_spinner"
         android:layout_width="0dp"
@@ -13,7 +20,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.495"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/question"
+        app:layout_constraintTop_toBottomOf="@id/question"
         app:layout_constraintVertical_bias="0.027"
         app:layout_constraintWidth_percent="0.70" />
 
@@ -35,7 +42,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!-- Weiter -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/Qnext"
         android:layout_width="@dimen/nav_btn_size"
@@ -57,31 +63,29 @@
     <TextView
         android:id="@+id/textView"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:layout_constraintTop_toBottomOf="@id/gTop"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.051"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.9" />
 
     <TextView
         android:id="@+id/question"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.15"
-        app:layout_constraintHorizontal_bias="0.512"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@id/textView"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView"
-        app:layout_constraintVertical_bias="0.0"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.9" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>