From 894823f42aacbb2071a5894c45863724f61275d2 Mon Sep 17 00:00:00 2001
From: oxidiert <daniel.ocks@gmx.de>
Date: Sun, 21 Sep 2025 19:49:49 +0200
Subject: [PATCH] finished opening screen

---
 .idea/deploymentTargetSelector.xml            |   2 +-
 app/build.gradle.kts                          |   2 +-
 app/src/main/assets/questionnaire_order.json  |   2 +-
 .../java/com/dano/test1/EditButtonHandler.kt  |  26 +-
 .../com/dano/test1/HandlerOpeningScreen.kt    | 441 +++++++++++++-----
 .../java/com/dano/test1/LanguageManager.kt    |  52 ++-
 .../java/com/dano/test1/LoadButtonHandler.kt  |  32 +-
 app/src/main/res/drawable/bg_chip_amber.xml   |   5 +
 app/src/main/res/drawable/bg_chip_green.xml   |   5 +
 app/src/main/res/drawable/bg_chip_grey.xml    |   5 +
 app/src/main/res/layout/opening_screen.xml    |  23 +-
 11 files changed, 420 insertions(+), 175 deletions(-)
 create mode 100644 app/src/main/res/drawable/bg_chip_amber.xml
 create mode 100644 app/src/main/res/drawable/bg_chip_green.xml
 create mode 100644 app/src/main/res/drawable/bg_chip_grey.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 4994cd7..49f900a 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-09-19T19:11:24.523816400Z">
+        <DropdownSelection timestamp="2025-09-21T10:53:27.572746300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\danie\.android\avd\Medium_Phone.avd" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cf10c39..60cb5c6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,7 +13,7 @@ android {
         minSdk = 29
         targetSdk = 35
         versionCode = 1
-        versionName = "1.1"
+        versionName = "1.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/assets/questionnaire_order.json b/app/src/main/assets/questionnaire_order.json
index 1df7042..5f971e3 100644
--- a/app/src/main/assets/questionnaire_order.json
+++ b/app/src/main/assets/questionnaire_order.json
@@ -48,7 +48,7 @@
   },
   {
     "file": "questionnaire_6_follow_up_survey.json",
-    "showPoints": false,
+    "showPoints": true,
     "condition": {
       "anyOf": [
         {
diff --git a/app/src/main/java/com/dano/test1/EditButtonHandler.kt b/app/src/main/java/com/dano/test1/EditButtonHandler.kt
index afcf7cf..bae1d08 100644
--- a/app/src/main/java/com/dano/test1/EditButtonHandler.kt
+++ b/app/src/main/java/com/dano/test1/EditButtonHandler.kt
@@ -14,8 +14,8 @@ class EditButtonHandler(
     private val questionnaireFiles: Map<Button, String>,
     private val buttonPoints: MutableMap<String, Int>,
     private val updateButtonTexts: () -> Unit,
-    private val setButtonsEnabled: (List<Button>) -> Unit,
-    // vor "Bearbeiten" ggf. Laden anstoßen
+    private val setButtonsEnabled: (List<Button>, Boolean) -> Unit,
+    private val setUiFreeze: (Boolean) -> Unit,
     private val triggerLoad: () -> Unit
 ) {
 
@@ -38,29 +38,29 @@ class EditButtonHandler(
             return
         }
 
-        // Nutzerwunsch merken (info)
         GlobalValues.LAST_CLIENT_CODE = desiredCode
 
-        // Nur laden, wenn noch nicht/anders geladen
         val needLoad = GlobalValues.LOADED_CLIENT_CODE?.equals(desiredCode) != true
-        if (needLoad) triggerLoad()
+        if (needLoad) {
+            // Zwischenzustände aus dem Load-Handler unterdrücken
+            setUiFreeze(true)
+            triggerLoad()
+        }
 
         CoroutineScope(Dispatchers.IO).launch {
             val loadedOk = waitUntilClientLoaded(desiredCode, timeoutMs = 2500, stepMs = 50)
             if (!loadedOk) {
                 withContext(Dispatchers.Main) {
                     Toast.makeText(activity, "Bitte den Klienten über \"Laden\" öffnen.", Toast.LENGTH_LONG).show()
+                    setUiFreeze(false)
                 }
                 return@launch
             }
 
-            // Ab hier: geladen → Bearbeiten-Logik
             val completedEntries: List<CompletedQuestionnaire> =
                 MyApp.database.completedQuestionnaireDao().getAllForClient(desiredCode)
 
-            val completedFiles = completedEntries
-                .filter { it.isDone }
-                .map { it.questionnaireId.lowercase() }
+            val completedFiles = completedEntries.filter { it.isDone }.map { it.questionnaireId.lowercase() }
 
             buttonPoints.clear()
             for (entry in completedEntries) {
@@ -70,21 +70,19 @@ class EditButtonHandler(
             }
 
             withContext(Dispatchers.Main) {
+                // nur den finalen Zustand anzeigen
                 updateButtonTexts()
-
                 val enabledButtons = questionnaireFiles.filter { (_, fileName) ->
                     completedFiles.any { completedId -> fileName.lowercase().contains(completedId) }
                 }.keys.toList()
-
-                setButtonsEnabled(enabledButtons)
+                setButtonsEnabled(enabledButtons, true)
+                setUiFreeze(false)
             }
         }
     }
 
     private suspend fun waitUntilClientLoaded(expectedCode: String, timeoutMs: Long, stepMs: Long): Boolean {
-        // sofort ok, wenn bereits korrekt geladen
         if (GlobalValues.LOADED_CLIENT_CODE?.equals(expectedCode) == true) return true
-
         var waited = 0L
         while (waited < timeoutMs) {
             delay(stepMs)
diff --git a/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt b/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt
index f9c2ef8..ba5e2f9 100644
--- a/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt
+++ b/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt
@@ -1,9 +1,12 @@
 package com.dano.test1
 
+import android.content.res.ColorStateList
 import android.graphics.Color
+import android.util.TypedValue
+import android.view.Gravity
 import android.view.View
 import android.widget.*
-import kotlinx.coroutines.*
+import com.google.android.material.button.MaterialButton
 import org.json.JSONArray
 import org.json.JSONObject
 import java.io.File
@@ -22,37 +25,46 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
     private lateinit var editButton: Button
     private lateinit var uploadButton: Button
     private lateinit var downloadButton: Button
-    private lateinit var databaseButton: Button   // <-- NEU
+    private lateinit var databaseButton: Button
 
     private val dynamicButtons = mutableListOf<Button>()
     private val questionnaireFiles = mutableMapOf<Button, String>()
+
+    private data class CardParts(
+        val title: TextView,
+        val subtitle: TextView,
+        val chip: TextView
+    )
+    private val cardParts = mutableMapOf<Button, CardParts>()
+
     private val buttonPoints: MutableMap<String, Int> = mutableMapOf()
     private var questionnaireEntries: List<QuestionItem.QuestionnaireEntry> = emptyList()
 
+    private var uiFreeze: Boolean = false
+
+    // Feste Standard-Randfarben
+    private val STROKE_ENABLED  = Color.parseColor("#8C79F2") // wenn anklickbar
+    private val STROKE_DISABLED = Color.parseColor("#D8D3F5") // wenn nicht anklickbar
+
+    private fun t(id: String) = LanguageManager.getText(languageID, id)
+
     fun init() {
         activity.setContentView(R.layout.opening_screen)
-
         bindViews()
-
         loadQuestionnaireOrder()
         createQuestionnaireButtons()
         restorePreviousClientCode()
-
         setupLanguageSpinner()
         setupLoadButton()
         setupSaveButton()
         setupEditButtonHandler()
         setupUploadButton()
         setupDownloadButton()
-        setupDatabaseButtonHandler() // <-- NEU
+        setupDatabaseButtonHandler()
 
-        val dbPath = "/data/data/com.dano.test1/databases/questionnaire_database"
-        val pathExists = File(dbPath).exists()
+        val pathExists = File("/data/data/com.dano.test1/databases/questionnaire_database").exists()
         updateMainButtonsState(pathExists)
-
-        if (pathExists && !editText.text.isNullOrBlank()) {
-            buttonLoad.performClick()
-        }
+        if (pathExists && !editText.text.isNullOrBlank()) buttonLoad.performClick()
     }
 
     private fun bindViews() {
@@ -65,11 +77,11 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         editButton = activity.findViewById(R.id.editButton)
         uploadButton = activity.findViewById(R.id.uploadButton)
         downloadButton = activity.findViewById(R.id.downloadButton)
-        databaseButton = activity.findViewById(R.id.databaseButton) // <-- NEU
+        databaseButton = activity.findViewById(R.id.databaseButton)
 
         val tag = editText.tag as? String ?: ""
-        editText.hint = LanguageManager.getText(languageID, tag)
-        textView.text = LanguageManager.getText(languageID, "example_text")
+        editText.hint = t(tag)
+        textView.text = t("example_text")
     }
 
     private fun loadQuestionnaireOrder() {
@@ -84,11 +96,9 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
                 val conditionObj = obj.optJSONObject("condition")
                 val condition = parseCondition(conditionObj)
                 val showPoints = obj.optBoolean("showPoints", false)
-
                 QuestionItem.QuestionnaireEntry(file, condition, showPoints)
             }
-        } catch (e: Exception) {
-            e.printStackTrace()
+        } catch (_: Exception) {
             questionnaireEntries = emptyList()
         }
     }
@@ -104,17 +114,14 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
             }
             return QuestionItem.Condition.AnyOf(conditions)
         }
-        if (conditionObj.has("alwaysAvailable")) {
-            val flag = conditionObj.optBoolean("alwaysAvailable", false)
-            if (flag) return QuestionItem.Condition.AlwaysAvailable
+        if (conditionObj.has("alwaysAvailable") && conditionObj.optBoolean("alwaysAvailable", false)) {
+            return QuestionItem.Condition.AlwaysAvailable
         }
         val requiresList = mutableListOf<String>()
         if (conditionObj.has("requiresCompleted")) {
             val reqArr = conditionObj.optJSONArray("requiresCompleted")
             if (reqArr != null) {
-                for (i in 0 until reqArr.length()) {
-                    requiresList.add(reqArr.optString(i))
-                }
+                for (i in 0 until reqArr.length()) requiresList.add(reqArr.optString(i))
             } else {
                 conditionObj.optString("requiresCompleted")?.let { if (it.isNotBlank()) requiresList.add(it) }
             }
@@ -123,17 +130,15 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         val questionId = conditionObj.optString("questionId", null)
         val operator = conditionObj.optString("operator", null)
         val value = conditionObj.optString("value", null)
-        val hasQuestionCheck = !questionnaire.isNullOrBlank() && !questionId.isNullOrBlank() && !operator.isNullOrBlank() && value != null
+        val hasQuestionCheck =
+            !questionnaire.isNullOrBlank() && !questionId.isNullOrBlank() && !operator.isNullOrBlank() && value != null
         return when {
-            requiresList.isNotEmpty() && hasQuestionCheck -> {
+            requiresList.isNotEmpty() && hasQuestionCheck ->
                 QuestionItem.Condition.Combined(requiresList, QuestionItem.Condition.QuestionCondition(questionnaire!!, questionId!!, operator!!, value!!))
-            }
-            hasQuestionCheck -> {
+            hasQuestionCheck ->
                 QuestionItem.Condition.QuestionCondition(questionnaire!!, questionId!!, operator!!, value!!)
-            }
-            requiresList.isNotEmpty() -> {
+            requiresList.isNotEmpty() ->
                 QuestionItem.Condition.RequiresCompleted(requiresList)
-            }
             else -> null
         }
     }
@@ -142,34 +147,95 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         buttonContainer.removeAllViews()
         dynamicButtons.clear()
         questionnaireFiles.clear()
-        for ((index, entry) in questionnaireEntries.withIndex()) {
-            val button = Button(activity).apply {
+        cardParts.clear()
+
+        val vMargin = dp(8)
+        val startEnabled = mutableListOf<Button>()
+
+        questionnaireEntries.forEachIndexed { index, entry ->
+            val row = FrameLayout(activity).apply {
                 layoutParams = LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.MATCH_PARENT,
                     LinearLayout.LayoutParams.WRAP_CONTENT
-                ).apply { setMargins(0, 8, 0, 8) }
-                text = "Questionnaire ${index + 1}"
+                ).also { it.setMargins(0, vMargin, 0, vMargin) }
+            }
+
+            val btn = MaterialButton(activity).apply {
+                layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    dp(84)
+                )
+                text = ""
+                isAllCaps = false
+                setMinimumWidth(0)
+                setMinimumHeight(0)
+                cornerRadius = dp(22)
+                strokeWidth = dp(1)
+                strokeColor = ColorStateList.valueOf(STROKE_DISABLED)
+                backgroundTintList = ColorStateList.valueOf(Color.WHITE)
+                rippleColor = ColorStateList.valueOf(Color.parseColor("#22000000"))
+                gravity = Gravity.START or Gravity.CENTER_VERTICAL
+                setPadding(dp(20), 0, dp(20), 0)
                 id = View.generateViewId()
+                setOnClickListener {
+                    GlobalValues.LAST_CLIENT_CODE = GlobalValues.LOADED_CLIENT_CODE
+                    val fileName = questionnaireFiles[this] ?: return@setOnClickListener
+                    val questionnaire = QuestionnaireGeneric(fileName)
+                    startQuestionnaire(questionnaire)
+                    applySetButtonsEnabled(dynamicButtons.filter { it == this }, allowCompleted = false, force = false)
+                }
             }
-            buttonContainer.addView(button)
-            dynamicButtons.add(button)
-            questionnaireFiles[button] = entry.file
-        }
-        updateButtonTexts()
 
-        val alwaysButtons = questionnaireEntries.mapIndexedNotNull { idx, entry ->
-            val btn = dynamicButtons.getOrNull(idx)
-            if (entry.condition is QuestionItem.Condition.AlwaysAvailable) btn else null
-        }
-        setButtonsEnabled(alwaysButtons)
-
-        dynamicButtons.forEach { button ->
-            button.setOnClickListener {
-                GlobalValues.LAST_CLIENT_CODE = GlobalValues.LOADED_CLIENT_CODE
-                startQuestionnaireForButton(button)
-                setButtonsEnabled(dynamicButtons.filter { it == button })
+            val textColumn = LinearLayout(activity).apply {
+                orientation = LinearLayout.VERTICAL
+                layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                    Gravity.START or Gravity.CENTER_VERTICAL
+                ).also { it.marginStart = dp(24) }
             }
+            val tvTitle = TextView(activity).apply {
+                setTextSize(TypedValue.COMPLEX_UNIT_SP, 18f)
+                setTextColor(Color.parseColor("#2F2A49"))
+                setPadding(0, dp(6), 0, dp(2))
+            }
+            val tvSubtitle = TextView(activity).apply {
+                setTextSize(TypedValue.COMPLEX_UNIT_SP, 13f)
+                setTextColor(Color.parseColor("#7B7794"))
+                visibility = View.GONE
+            }
+            textColumn.addView(tvTitle)
+            textColumn.addView(tvSubtitle)
+
+            val chip = TextView(activity).apply {
+                setPadding(dp(14), dp(8), dp(14), dp(8))
+                setTextColor(Color.WHITE)
+                text = t("start")
+                setBackgroundResource(R.drawable.bg_chip_amber)
+                setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
+                layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                    Gravity.END or Gravity.CENTER_VERTICAL
+                ).also { it.marginEnd = dp(16) }
+            }
+
+            row.addView(btn)
+            row.addView(textColumn)
+            row.addView(chip)
+
+            buttonContainer.addView(row)
+            dynamicButtons.add(btn)
+            questionnaireFiles[btn] = entry.file
+            cardParts[btn] = CardParts(tvTitle, tvSubtitle, chip)
+
+            tvTitle.text = "Questionnaire ${index + 1}"
+
+            if (entry.condition is QuestionItem.Condition.AlwaysAvailable) startEnabled.add(btn)
         }
+
+        applyUpdateButtonTexts(force = false)
+        applySetButtonsEnabled(startEnabled, allowCompleted = false, force = false)
     }
 
     private fun restorePreviousClientCode() {
@@ -186,9 +252,9 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
                 languageID = languages[position]
-                updateButtonTexts()
+                applyUpdateButtonTexts(force = false)
                 val hintTag = editText.tag as? String ?: ""
-                editText.hint = LanguageManager.getText(languageID, hintTag)
+                editText.hint = t(hintTag)
             }
             override fun onNothingSelected(parent: AdapterView<*>) {}
         }
@@ -203,64 +269,135 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
             questionnaireEntriesProvider = { questionnaireEntries },
             dynamicButtonsProvider = { dynamicButtons },
             buttonPoints = buttonPoints,
-            updateButtonTexts = { updateButtonTexts() },
-            setButtonsEnabled = { setButtonsEnabled(it) },
+            updateButtonTexts = { applyUpdateButtonTexts(force = false) },
+            setButtonsEnabled = { list -> applySetButtonsEnabled(list, allowCompleted = false, force = false) },
             updateMainButtonsState = { updateMainButtonsState(it) },
         ).setup()
     }
 
-    private fun updateButtonTexts() {
-        // --- dynamische Fragebogen-Buttons wie gehabt ---
+    private fun applyUpdateButtonTexts(force: Boolean) {
+        if (uiFreeze && !force) return
+
         questionnaireFiles.forEach { (button, fileName) ->
             val entry = questionnaireEntries.firstOrNull { it.file == fileName }
             val key = fileName.substringAfter("questionnaire_").substringAfter("_").removeSuffix(".json")
-            var buttonText = LanguageManager.getText(languageID, key)
-            val pointsAvailable = buttonPoints.entries.firstOrNull { fileName.contains(it.key, ignoreCase = true) }
-            val points = pointsAvailable?.value ?: 0
+            val titleText = t(key)
 
-            if (entry?.showPoints == true && pointsAvailable != null) {
-                buttonText += " (${points} P)"
-            }
-            button.text = buttonText
+            val parts = cardParts[button] ?: return@forEach
+            parts.title.text = titleText
 
-            if (entry?.showPoints == true && pointsAvailable != null) {
-                when {
-                    points in 0..12  -> button.setBackgroundColor(Color.parseColor("#4CAF50"))
-                    points in 13..36 -> button.setBackgroundColor(Color.parseColor("#FFEB3B"))
-                    points in 37..100-> button.setBackgroundColor(Color.parseColor("#F44336"))
-                    else             -> button.setBackgroundColor(Color.parseColor("#E0E0E0"))
-                }
+            val points = buttonPoints.entries.firstOrNull { fileName.contains(it.key, ignoreCase = true) }?.value
+            val completed = isCompleted(button)
+            val enabled = button.isEnabled
+            val locked = !enabled && !completed
+
+            // Rahmenbreite & -farbe je nach Klickbarkeit
+            setClickableStroke(button, enabled)
+
+            if (locked) {
+                setLockedAppearance(button, true)
+                parts.title.setTextColor(Color.WHITE)
+                parts.subtitle.setTextColor(Color.parseColor("#E0E0E0"))
             } else {
-                button.setBackgroundColor(Color.parseColor("#E0E0E0"))
+                setLockedAppearance(button, false)
+                parts.title.setTextColor(Color.parseColor("#2F2A49"))
+                parts.subtitle.setTextColor(Color.parseColor("#7B7794"))
+                // Tönung nur wenn showPoints == true
+                applyTintForButton(button, points, emphasize = enabled)
+            }
+
+            if (entry?.showPoints == true && points != null) {
+                parts.subtitle.visibility = View.VISIBLE
+                parts.subtitle.text = "${t("points")}: $points"
+            } else {
+                parts.subtitle.visibility = View.GONE
+                parts.subtitle.text = ""
+            }
+
+            when {
+                completed -> {
+                    parts.chip.text = t("done")
+                    parts.chip.setBackgroundResource(R.drawable.bg_chip_green)
+                    parts.chip.setTextColor(Color.WHITE)
+                }
+                enabled -> {
+                    parts.chip.text = t("start")
+                    parts.chip.setBackgroundResource(R.drawable.bg_chip_amber)
+                    parts.chip.setTextColor(Color.WHITE)
+                }
+                else -> {
+                    parts.chip.text = t("locked")
+                    parts.chip.setBackgroundResource(R.drawable.bg_chip_grey)
+                    parts.chip.setTextColor(Color.parseColor("#2F2A49"))
+                }
             }
         }
 
-        // --- HIER: alle Hauptbuttons nach Sprache neu setzen ---
-        buttonLoad.text    = LanguageManager.getText(languageID, "load")
-        saveButton.text    = LanguageManager.getText(languageID, "save")
-        editButton.text    = LanguageManager.getText(languageID, "edit")
-        uploadButton.text  = LanguageManager.getText(languageID, "upload")
-        downloadButton.text= LanguageManager.getText(languageID, "download")
-        databaseButton.text= LanguageManager.getText(languageID, "database")
+        buttonLoad.text     = t("load")
+        saveButton.text     = t("save")
+        editButton.text     = t("edit")
+        uploadButton.text   = t("upload")
+        downloadButton.text = t("download")
+        databaseButton.text = t("database")
 
-        // optional: Beispieltext/Hints auch aktualisieren
         val hintTag = editText.tag as? String ?: ""
-        editText.hint = LanguageManager.getText(languageID, hintTag)
-        textView.text = LanguageManager.getText(languageID, "example_text")
+        editText.hint = t(hintTag)
+        textView.text = t("example_text")
     }
 
-    private fun setButtonsEnabled(enabledButtons: List<Button>) {
+    private fun applySetButtonsEnabled(enabledButtons: List<Button>, allowCompleted: Boolean, force: Boolean) {
+        if (uiFreeze && !force) return
+
         questionnaireFiles.keys.forEach { button ->
-            button.isEnabled = enabledButtons.contains(button)
-            button.alpha = if (button.isEnabled) 1.0f else 0.5f
+            val completed = isCompleted(button)
+            val isAllowed = enabledButtons.contains(button)
+            val shouldEnable = if (allowCompleted) isAllowed else isAllowed && !completed
+            val locked = !shouldEnable && !completed
+
+            button.isEnabled = shouldEnable
+            button.alpha = if (completed || shouldEnable) 1.0f else 0.6f
+
+            // Rahmenbreite & -farbe je nach Klickbarkeit
+            setClickableStroke(button, shouldEnable)
+
+            cardParts[button]?.let { parts ->
+                if (locked) {
+                    setLockedAppearance(button, true)
+                    parts.title.setTextColor(Color.WHITE)
+                    parts.subtitle.setTextColor(Color.parseColor("#E0E0E0"))
+                } else {
+                    setLockedAppearance(button, false)
+                    parts.title.setTextColor(Color.parseColor("#2F2A49"))
+                    parts.subtitle.setTextColor(Color.parseColor("#7B7794"))
+                    // Tönung nur wenn showPoints == true
+                    applyTintForButton(button, getPointsForButton(button), emphasize = shouldEnable)
+                }
+
+                when {
+                    completed -> {
+                        parts.chip.text = t("done")
+                        parts.chip.setBackgroundResource(R.drawable.bg_chip_green)
+                        parts.chip.setTextColor(Color.WHITE)
+                    }
+                    shouldEnable -> {
+                        parts.chip.text = t("start")
+                        parts.chip.setBackgroundResource(R.drawable.bg_chip_amber)
+                        parts.chip.setTextColor(Color.WHITE)
+                    }
+                    else -> {
+                        parts.chip.text = t("locked")
+                        parts.chip.setBackgroundResource(R.drawable.bg_chip_grey)
+                        parts.chip.setTextColor(Color.parseColor("#2F2A49"))
+                    }
+                }
+            }
         }
     }
 
-    private fun startQuestionnaireForButton(button: Button) {
-        val fileName = questionnaireFiles[button] ?: return
-        val questionnaire = QuestionnaireGeneric(fileName)
-        startQuestionnaire(questionnaire)
-    }
+    // öffentliche Wrapper
+    private fun updateButtonTexts() = applyUpdateButtonTexts(force = false)
+    private fun setButtonsEnabled(enabledButtons: List<Button>, allowCompleted: Boolean = false) =
+        applySetButtonsEnabled(enabledButtons, allowCompleted, force = false)
 
     private fun startQuestionnaire(questionnaire: QuestionnaireBase<*>) {
         activity.startQuestionnaire(questionnaire, languageID)
@@ -285,48 +422,46 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
             languageIDProvider = { languageID },
             questionnaireFiles = questionnaireFiles,
             buttonPoints = buttonPoints,
-            updateButtonTexts = { updateButtonTexts() },
-            setButtonsEnabled = { setButtonsEnabled(it) },
+            updateButtonTexts = { applyUpdateButtonTexts(force = true) },
+            setButtonsEnabled = { list, allowCompleted ->
+                applySetButtonsEnabled(list, allowCompleted, force = true)
+            },
+            setUiFreeze = { freeze -> uiFreeze = freeze },
             triggerLoad = { buttonLoad.performClick() }
         ).setup()
     }
 
     private fun setupUploadButton() {
-        uploadButton.text = "Upload"
+        uploadButton.text = t("upload")
         uploadButton.setOnClickListener {
             val clientCode = editText.text.toString().trim()
-
             GlobalValues.LAST_CLIENT_CODE = clientCode
-
             val input = EditText(activity).apply { hint = "Server-Passwort" }
-
             android.app.AlertDialog.Builder(activity)
-                .setTitle("Login erforderlich")
+                .setTitle(t("login_required"))
                 .setView(input)
                 .setPositiveButton("OK") { _, _ ->
                     val password = input.text.toString()
                     if (password.isNotBlank()) {
-                        Toast.makeText(activity, "Login wird überprüft...", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(activity, t("checking_login"), Toast.LENGTH_SHORT).show()
                         DatabaseUploader.uploadDatabaseWithLogin(activity, password)
                     } else {
-                        Toast.makeText(activity, "Bitte Passwort eingeben", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(activity, t("enter_password"), Toast.LENGTH_SHORT).show()
                     }
                 }
-                .setNegativeButton("Abbrechen", null)
+                .setNegativeButton(t("cancel"), null)
                 .show()
         }
     }
 
     private fun setupDownloadButton() {
-        downloadButton.text = "Download"
+        downloadButton.text = t("download")
         downloadButton.setOnClickListener {
             val clientCode = editText.text.toString().trim()
             GlobalValues.LAST_CLIENT_CODE = clientCode
-
             val input = EditText(activity).apply { hint = "Server-Passwort" }
-
             android.app.AlertDialog.Builder(activity)
-                .setTitle("Login erforderlich")
+                .setTitle(t("login_required"))
                 .setView(input)
                 .setPositiveButton("OK") { _, _ ->
                     val password = input.text.toString()
@@ -335,7 +470,7 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
                             context = activity,
                             password = password,
                             onSuccess = { token ->
-                                Toast.makeText(activity, "Login erfolgreich", Toast.LENGTH_SHORT).show()
+                                Toast.makeText(activity, t("login_ok"), Toast.LENGTH_SHORT).show()
                                 DatabaseDownloader.downloadAndReplaceDatabase(activity, token)
                                 updateMainButtonsState(true)
                             },
@@ -344,10 +479,10 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
                             }
                         )
                     } else {
-                        Toast.makeText(activity, "Bitte Passwort eingeben", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(activity, t("enter_password"), Toast.LENGTH_SHORT).show()
                     }
                 }
-                .setNegativeButton("Abbrechen", null)
+                .setNegativeButton(t("cancel"), null)
                 .show()
         }
     }
@@ -356,20 +491,92 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         DatabaseButtonHandler(
             activity = activity,
             databaseButton = databaseButton,
-            onClose = {
-                // zurück zum Opening-Screen
-                init()
-            },
-            languageIDProvider = { languageID }   // aktuelle Sprache an DatabaseButtonHandler weitergeben
+            onClose = { init() },
+            languageIDProvider = { languageID }
         ).setup()
     }
 
-
     private fun updateMainButtonsState(isDatabaseAvailable: Boolean) {
-        val buttons = listOf(buttonLoad, saveButton, editButton, databaseButton) // <-- NEU dabei
-        buttons.forEach { button ->
-            button.isEnabled = isDatabaseAvailable
-            button.alpha = if (isDatabaseAvailable) 1.0f else 0.5f
+        listOf(buttonLoad, saveButton, editButton, databaseButton).forEach { b ->
+            b.isEnabled = isDatabaseAvailable
+            b.alpha = if (isDatabaseAvailable) 1.0f else 0.5f
         }
     }
+
+    private fun dp(v: Int): Int =
+        (v * activity.resources.displayMetrics.density).toInt()
+
+    private fun isCompleted(button: Button): Boolean {
+        val fileName = questionnaireFiles[button] ?: return false
+        return buttonPoints.keys.any { k ->
+            fileName.contains(k, ignoreCase = true) || k.contains(fileName, ignoreCase = true)
+        }
+    }
+
+    private fun getPointsForButton(button: Button): Int? {
+        val fileName = questionnaireFiles[button] ?: return null
+        return buttonPoints.entries.firstOrNull { (k, _) ->
+            fileName.contains(k, ignoreCase = true) || k.contains(fileName, ignoreCase = true)
+        }?.value
+    }
+
+    /** Locked-Optik: schwarzer Hintergrund, fester grauer Rand */
+    private fun setLockedAppearance(button: Button, locked: Boolean) {
+        val mb = button as? MaterialButton ?: return
+        if (locked) {
+            mb.backgroundTintList = ColorStateList.valueOf(Color.BLACK)
+            mb.strokeColor = ColorStateList.valueOf(STROKE_DISABLED)
+        } else {
+            mb.backgroundTintList = ColorStateList.valueOf(Color.WHITE)
+            mb.strokeColor = ColorStateList.valueOf(if (button.isEnabled) STROKE_ENABLED else STROKE_DISABLED)
+        }
+    }
+
+    /** Standardfarben wiederherstellen (wenn showPoints == false) – hier nicht mehr für locked zuständig */
+    private fun resetTint(button: Button) {
+        val mb = button as? MaterialButton ?: return
+        mb.backgroundTintList = ColorStateList.valueOf(Color.WHITE)
+        mb.strokeColor = ColorStateList.valueOf(STROKE_DISABLED)
+    }
+
+    /** Tönung nur anwenden, wenn showPoints == true (und Button nicht locked) */
+    private fun applyTintForButton(button: Button, points: Int?, emphasize: Boolean) {
+        val file = questionnaireFiles[button] ?: return
+        val entry = questionnaireEntries.firstOrNull { it.file == file }
+
+        if (entry?.showPoints != true) {
+            val mb = button as? MaterialButton ?: return
+            mb.backgroundTintList = ColorStateList.valueOf(if (emphasize) Color.parseColor("#F1EEFF") else Color.WHITE)
+            mb.strokeColor = ColorStateList.valueOf(if (emphasize) STROKE_ENABLED else STROKE_DISABLED)
+            return
+        }
+
+        setScoreTint(button, points, emphasize)
+    }
+
+    /** Dickere Kontur, wenn anklickbar; Farbe bleibt fix */
+    private fun setClickableStroke(button: Button, enabled: Boolean) {
+        val mb = button as? MaterialButton ?: return
+        mb.strokeWidth = if (enabled) dp(2) else dp(1)
+        mb.strokeColor = ColorStateList.valueOf(if (enabled) STROKE_ENABLED else STROKE_DISABLED)
+    }
+
+    /** Hintergrund nach Score; Rand bleibt fix */
+    private fun setScoreTint(button: Button, points: Int?, emphasize: Boolean) {
+        val mb = button as? MaterialButton ?: return
+
+        val bg = when {
+            points == null && emphasize -> Color.parseColor("#F1EEFF")
+            points == null -> Color.parseColor("#FFFFFF")
+            points in 0..12 && emphasize -> Color.parseColor("#C8E6C9")
+            points in 0..12 -> Color.parseColor("#E8F5E9")
+            points in 13..36 && emphasize -> Color.parseColor("#FFE0B2")
+            points in 13..36 -> Color.parseColor("#FFF8E1")
+            points >= 37 && emphasize -> Color.parseColor("#FFCDD2")
+            else -> Color.parseColor("#FFEBEE")
+        }
+
+        mb.backgroundTintList = ColorStateList.valueOf(bg)
+        mb.strokeColor = ColorStateList.valueOf(if (emphasize) STROKE_ENABLED else STROKE_DISABLED)
+    }
 }
diff --git a/app/src/main/java/com/dano/test1/LanguageManager.kt b/app/src/main/java/com/dano/test1/LanguageManager.kt
index 5c44dfd..122b25e 100644
--- a/app/src/main/java/com/dano/test1/LanguageManager.kt
+++ b/app/src/main/java/com/dano/test1/LanguageManager.kt
@@ -352,10 +352,9 @@ object LanguageManager {
             "export_success_downloads_headers" to "Export erfolgreich: Downloads/ClientHeaders.xlsx",
             "export_failed"           to "Export fehlgeschlagen.",
             "error_generic"           to "Fehler",
-            "done"      to "abgeschlossen",
-            "not_done"  to "nicht abgeschlossen",
-            "none"      to "keine Angabe",
-
+            "not_done"  to "Nicht Fertog",
+            "none"      to "Keine Angabe",
+            "points" to "Punkte"
         ),
 
         "ENGLISH" to mapOf(
@@ -675,9 +674,12 @@ object LanguageManager {
             "export_success_downloads_headers" to "Export successful: Downloads/ClientHeaders.xlsx",
             "export_failed"           to "Export failed.",
             "error_generic"           to "Error",
-            "done"      to "Done",
             "not_done"  to "Not Done",
             "none"      to "None",
+            "done" to "Done",
+            "locked" to "Locked",
+            "start" to "Start",
+            "points" to "Points"
         ),
 
         "FRENCH" to mapOf(
@@ -1001,9 +1003,12 @@ object LanguageManager {
             "export_success_downloads_headers" to "Export réussi : Downloads/ClientHeaders.xlsx",
             "export_failed"     to "Échec de l’exportation.",
             "error_generic"     to "Erreur",
-            "done"      to "terminé",
             "not_done"  to "non terminé",
             "none"      to "aucune réponse",
+            "done" to "Terminé",
+            "locked" to "Verrouillé",
+            "start" to "Commencer",
+            "points" to "Points"
         ),
 
         "RUSSIAN" to mapOf(
@@ -1323,9 +1328,12 @@ object LanguageManager {
             "export_success_downloads_headers" to "Экспорт выполнен: Downloads/ClientHeaders.xlsx",
             "export_failed"     to "Экспорт не выполнен.",
             "error_generic"     to "Ошибка",
-            "done"      to "выполнено",
             "not_done"  to "не выполнено",
             "none"      to "нет ответа",
+            "done" to "Готово",
+            "locked" to "Заблокировано",
+            "start" to "Начать",
+            "points" to "Баллы"
         ),
 
         "UKRAINIAN" to mapOf(
@@ -1649,9 +1657,12 @@ object LanguageManager {
             "export_success_downloads_headers" to "Експорт успішний: Downloads/ClientHeaders.xlsx",
             "export_failed"     to "Помилка експорту.",
             "error_generic"     to "Помилка",
-            "done"      to "завершено",
             "not_done"  to "не завершено",
             "none"      to "немає відповіді",
+            "done" to "Завершено",
+            "locked" to "Заблоковано",
+            "start" to "Почати",
+            "points" to "Бали"
         ),
 
         "TURKISH" to mapOf(
@@ -1975,9 +1986,12 @@ object LanguageManager {
             "export_success_downloads_headers" to "Dışa aktarma başarılı: Downloads/ClientHeaders.xlsx",
             "export_failed"     to "Dışa aktarma başarısız.",
             "error_generic"     to "Hata",
-            "done"      to "tamamlandı",
             "not_done"  to "tamamlanmadı",
             "none"      to "yanıt yok",
+            "done" to "Tamamlandı",
+            "locked" to "Kilitli",
+            "start" to "Başlat",
+            "points" to "Puan"
         ),
 
         "POLISH" to mapOf(
@@ -2301,9 +2315,12 @@ object LanguageManager {
             "export_success_downloads_headers" to "Eksport zakończony: Downloads/ClientHeaders.xlsx",
             "export_failed"     to "Eksport nieudany.",
             "error_generic"     to "Błąd",
-            "done"      to "zakończono",
             "not_done"  to "nie zakończono",
             "none"      to "brak odpowiedzi",
+            "done" to "Gotowe",
+            "locked" to "Zablokowane",
+            "start" to "Rozpocznij",
+            "points" to "Punkty"
         ),
 
         "ARABIC" to mapOf(
@@ -2627,9 +2644,12 @@ object LanguageManager {
             "export_success_downloads_headers" to "تم التصدير بنجاح: Downloads/ClientHeaders.xlsx",
             "export_failed"     to "فشل التصدير.",
             "error_generic"     to "خطأ",
-            "done"      to "مكتمل",
             "not_done"  to "غير مكتمل",
             "none"      to "لا توجد إجابة",
+            "done" to "تم",
+            "locked" to "مقفل",
+            "start" to "ابدأ",
+            "points" to "النقاط"
         ),
 
         "ROMANIAN" to mapOf(
@@ -2953,9 +2973,12 @@ object LanguageManager {
             "export_success_downloads_headers" to "Export reușit: Downloads/ClientHeaders.xlsx",
             "export_failed"     to "Export nereușit.",
             "error_generic"     to "Eroare",
-            "done"      to "finalizat",
             "not_done"  to "nefinalizat",
             "none"      to "niciun răspuns",
+            "done" to "Finalizat",
+            "locked" to "Blocat",
+            "start" to "Începe",
+            "points" to "Puncte"
         ),
 
         "SPANISH" to mapOf(
@@ -3279,9 +3302,12 @@ object LanguageManager {
             "export_success_downloads_headers" to "Exportación correcta: Downloads/ClientHeaders.xlsx",
             "export_failed"     to "Fallo en la exportación.",
             "error_generic"     to "Error",
-            "done"      to "completado",
             "not_done"  to "no completado",
             "none"      to "sin respuesta",
+            "done" to "Completado",
+            "locked" to "Bloqueado",
+            "start" to "Iniciar",
+            "points" to "Puncte"
         )
     )
 }
diff --git a/app/src/main/java/com/dano/test1/LoadButtonHandler.kt b/app/src/main/java/com/dano/test1/LoadButtonHandler.kt
index bbf589d..dd2b699 100644
--- a/app/src/main/java/com/dano/test1/LoadButtonHandler.kt
+++ b/app/src/main/java/com/dano/test1/LoadButtonHandler.kt
@@ -25,10 +25,6 @@ class LoadButtonHandler(
     }
 
     private fun handleLoadButton() {
-        buttonPoints.clear()
-        updateButtonTexts()
-        setButtonsEnabled(emptyList())
-
         val inputText = editText.text.toString().trim()
         if (inputText.isBlank()) {
             val message = LanguageManager.getText(languageIDProvider(), "please_client_code")
@@ -36,13 +32,16 @@ class LoadButtonHandler(
             return
         }
 
+        buttonPoints.clear()
+        setButtonsEnabled(emptyList())   // temporär sperren
+        updateButtonTexts()              // Chips zeigen vorläufig „Gesperrt“
+
         val clientCode = inputText
         GlobalValues.LAST_CLIENT_CODE = clientCode
 
         CoroutineScope(Dispatchers.IO).launch {
             val client = MyApp.database.clientDao().getClientByCode(clientCode)
             if (client == null) {
-                // Kein Profil → als NICHT geladen markieren
                 GlobalValues.LOADED_CLIENT_CODE = null
                 withContext(Dispatchers.Main) {
                     val message = LanguageManager.getText(languageIDProvider(), "no_profile")
@@ -53,21 +52,18 @@ class LoadButtonHandler(
                         if (entry.condition is QuestionItem.Condition.AlwaysAvailable) btn else null
                     }
                     setButtonsEnabled(alwaysButtons)
+                    updateButtonTexts()   // <- nach dem Aktivieren Chips aktualisieren
                 }
                 return@launch
             }
 
-            // Profil gefunden → als geladen markieren
             GlobalValues.LOADED_CLIENT_CODE = clientCode
-
-            withContext(Dispatchers.Main) {
-                updateMainButtonsState(true)
-            }
-
+            withContext(Dispatchers.Main) { updateMainButtonsState(true) }
             handleNormalLoad(clientCode)
         }
     }
 
+
     private suspend fun evaluateCondition(
         condition: QuestionItem.Condition?,
         clientCode: String,
@@ -134,10 +130,6 @@ class LoadButtonHandler(
             }
         }
 
-        withContext(Dispatchers.Main) {
-            updateButtonTexts()
-        }
-
         val enabledButtons = mutableListOf<Button>()
         val questionnaireEntries = questionnaireEntriesProvider()
         val dynamicButtons = dynamicButtonsProvider()
@@ -158,13 +150,9 @@ class LoadButtonHandler(
         }
 
         withContext(Dispatchers.Main) {
-            if (enabledButtons.isEmpty()) {
-                setButtonsEnabled(emptyList())
-                val message = LanguageManager.getText(languageIDProvider(), "questionnaires_finished")
-                Toast.makeText(activity, message, Toast.LENGTH_LONG).show()
-            } else {
-                setButtonsEnabled(enabledButtons)
-            }
+            setButtonsEnabled(enabledButtons)   // erst aktivieren …
+            updateButtonTexts()                 // … dann Chips/Labels korrekt setzen
         }
     }
+
 }
diff --git a/app/src/main/res/drawable/bg_chip_amber.xml b/app/src/main/res/drawable/bg_chip_amber.xml
new file mode 100644
index 0000000..79ac093
--- /dev/null
+++ b/app/src/main/res/drawable/bg_chip_amber.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#F2B544"/>
+    <corners android:radius="18dp"/>
+    <padding android:left="8dp" android:top="6dp" android:right="8dp" android:bottom="6dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/bg_chip_green.xml b/app/src/main/res/drawable/bg_chip_green.xml
new file mode 100644
index 0000000..41d7f83
--- /dev/null
+++ b/app/src/main/res/drawable/bg_chip_green.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#43B581"/>
+    <corners android:radius="18dp"/>
+    <padding android:left="8dp" android:top="6dp" android:right="8dp" android:bottom="6dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/bg_chip_grey.xml b/app/src/main/res/drawable/bg_chip_grey.xml
new file mode 100644
index 0000000..71430cc
--- /dev/null
+++ b/app/src/main/res/drawable/bg_chip_grey.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#E3E5EF"/>
+    <corners android:radius="18dp"/>
+    <padding android:left="8dp" android:top="6dp" android:right="8dp" android:bottom="6dp"/>
+</shape>
diff --git a/app/src/main/res/layout/opening_screen.xml b/app/src/main/res/layout/opening_screen.xml
index 1dadff5..96c86d9 100644
--- a/app/src/main/res/layout/opening_screen.xml
+++ b/app/src/main/res/layout/opening_screen.xml
@@ -10,6 +10,7 @@
         android:id="@+id/headerCard"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         android:paddingTop="20dp"
@@ -207,14 +208,24 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
-    <LinearLayout
-        android:id="@+id/buttonContainer"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/questionnaireScroll"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="8dp"
+        android:layout_height="0dp"
+        android:fillViewport="true"
+        android:clipToPadding="false"
+        android:paddingBottom="16dp"
         app:layout_constraintTop_toBottomOf="@id/textView"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <LinearLayout
+            android:id="@+id/buttonContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingTop="8dp"/>
+    </androidx.core.widget.NestedScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>