feat(device-initialization, core): Unterstützung für Hilfe-Tooltips, Netzwerk-Interface-Auswahl & Discovery-Radar ergänzt

Signed-off-by: Stefan Mogeritsch <stefan.mo.co@gmail.com>
This commit is contained in:
2026-04-29 12:45:44 +02:00
parent d0edfa2538
commit 8ecc9fbe52
10 changed files with 237 additions and 15 deletions
@@ -27,6 +27,7 @@ data class ExpectedClient(
@Serializable
data class DeviceInitializationSettings(
val deviceName: String = "",
val networkInterface: String = "",
val sharedKey: String = "",
val backupPath: String = "",
val networkRole: NetworkRole = NetworkRole.CLIENT,
@@ -2,6 +2,8 @@
package at.mocode.frontend.features.device.initialization.presentation
import androidx.compose.animation.core.*
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
@@ -10,6 +12,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowForward
import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.NetworkCheck
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
@@ -19,12 +22,65 @@ import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component1
import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component2
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.drawscope.Stroke
import androidx.compose.ui.input.key.*
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import at.mocode.frontend.features.device.initialization.domain.DeviceInitializationValidator
@Composable
private fun DiscoveryRadar() {
val infiniteTransition = rememberInfiniteTransition()
val radius by infiniteTransition.animateFloat(
initialValue = 0f,
targetValue = 40f,
animationSpec = infiniteRepeatable(
animation = tween(2000, easing = LinearEasing),
repeatMode = RepeatMode.Restart
)
)
val alpha by infiniteTransition.animateFloat(
initialValue = 1f,
targetValue = 0f,
animationSpec = infiniteRepeatable(
animation = tween(2000, easing = LinearEasing),
repeatMode = RepeatMode.Restart
)
)
val color = MaterialTheme.colorScheme.primary
Box(
modifier = Modifier.size(80.dp),
contentAlignment = androidx.compose.ui.Alignment.Center
) {
Canvas(modifier = Modifier.fillMaxSize()) {
drawCircle(
color = color,
radius = radius.dp.toPx(),
center = Offset(size.width / 2, size.height / 2),
style = Stroke(width = 2.dp.toPx()),
alpha = alpha
)
drawCircle(
color = color,
radius = (radius * 0.5f).dp.toPx(),
center = Offset(size.width / 2, size.height / 2),
style = Stroke(width = 1.dp.toPx()),
alpha = alpha * 0.5f
)
}
Icon(
imageVector = Icons.Default.NetworkCheck,
contentDescription = null,
tint = color,
modifier = Modifier.size(24.dp)
)
}
}
@Composable
fun DeviceInitializationScreen(
viewModel: DeviceInitializationViewModel
@@ -67,6 +123,20 @@ fun DeviceInitializationScreen(
style = MaterialTheme.typography.bodySmall
)
Row(
modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp),
verticalAlignment = androidx.compose.ui.Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center
) {
DiscoveryRadar()
Spacer(modifier = Modifier.width(16.dp))
Text(
"Suche nach Geräten im Netzwerk...",
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
NetworkRoleSelector(
selectedRole = uiState.settings.networkRole,
onRoleSelected = {
@@ -8,7 +8,17 @@ import kotlinx.serialization.json.Json
import java.io.File
actual object DeviceInitializationSettingsManager {
private val settingsFile = File("settings.json")
private val settingsFile: File by lazy {
val os = System.getProperty("os.name").lowercase()
val appName = "Meldestelle"
val baseDir = when {
os.contains("win") -> File(System.getenv("APPDATA"), appName)
os.contains("mac") -> File(System.getProperty("user.home"), "Library/Application Support/$appName")
else -> File(System.getProperty("user.home"), ".config/$appName")
}
if (!baseDir.exists()) baseDir.mkdirs()
File(baseDir, "settings.json")
}
private val json = Json { prettyPrint = true; ignoreUnknownKeys = true }
actual fun saveSettings(settings: DeviceInitializationSettings) {
@@ -34,6 +34,7 @@ import at.mocode.frontend.core.designsystem.components.MsStringDropdown
import at.mocode.frontend.core.designsystem.components.MsTextField
import at.mocode.frontend.features.device.initialization.domain.DeviceInitializationValidator
import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
import java.net.NetworkInterface
import javax.print.PrintServiceLookup
@Composable
@@ -57,6 +58,7 @@ actual fun DeviceInitializationConfig(
value = settings.deviceName,
onValueChange = { viewModel.updateSettings { s -> s.copy(deviceName = it) } },
label = "Gerätename",
helpDescription = "Ein eindeutiger Name für diesen PC (z.B. 'Richter-Springplatz'). Dies hilft dem Master, die Datenquellen zuzuordnen.",
placeholder = "z.B. Meldestelle-PC-1",
isError = settings.deviceName.isNotEmpty() && !DeviceInitializationValidator.isNameValid(settings.deviceName),
errorMessage = "Mindestens ${DeviceInitializationValidator.MIN_NAME_LENGTH} Zeichen erforderlich.",
@@ -66,11 +68,28 @@ actual fun DeviceInitializationConfig(
enabled = !uiState.isLocked
)
val interfaces = remember {
NetworkInterface.getNetworkInterfaces().toList()
.filter { it.isUp && !it.isLoopback && it.inetAddresses.hasMoreElements() }
.map { "${it.displayName} (${it.inetAddresses.nextElement().hostAddress})" }
}
MsStringDropdown(
label = "Netzwerk-Interface",
helpDescription = "Wähle das Netzwerk-Interface aus, über das die App kommunizieren soll (z.B. LAN für das Turnier-Netzwerk).",
options = interfaces,
selectedOption = settings.networkInterface,
onOptionSelected = { viewModel.updateSettings { s -> s.copy(networkInterface = it) } },
placeholder = "Interface wählen...",
enabled = !uiState.isLocked
)
var passwordVisible by remember { mutableStateOf(false) }
MsTextField(
value = settings.sharedKey,
onValueChange = { viewModel.updateSettings { s -> s.copy(sharedKey = it) } },
label = "Sicherheitsschlüssel (Sync-Key)",
helpDescription = "Das 'Turnier-Passwort'. Nur Geräte mit exakt diesem Schlüssel können Daten austauschen. Wichtig für die Verschlüsselung (DSGVO)!",
placeholder = "Mindestens 8 Zeichen",
isError = settings.sharedKey.isNotEmpty() && !DeviceInitializationValidator.isKeyValid(settings.sharedKey),
errorMessage = "Mindestens ${DeviceInitializationValidator.MIN_KEY_LENGTH} Zeichen erforderlich.",
@@ -87,6 +106,7 @@ actual fun DeviceInitializationConfig(
MsFilePicker(
label = "Backup-Verzeichnis (Pfad)",
helpDescription = "Wähle hier deinen USB-Stick oder einen lokalen Ordner aus. Die App speichert hier laufend Sicherheitskopien für den Notfall (Plan-USB).",
selectedPath = settings.backupPath,
onFileSelected = { selectedPath ->
viewModel.updateSettings { s -> s.copy(backupPath = selectedPath) }
@@ -102,6 +122,7 @@ actual fun DeviceInitializationConfig(
MsStringDropdown(
label = "Standard-Drucker",
helpDescription = "Der Drucker, der standardmäßig für Protokolle und Listen verwendet wird. Kann später jederzeit geändert werden.",
options = printers,
selectedOption = settings.defaultPrinter,
onOptionSelected = { viewModel.updateSettings { s -> s.copy(defaultPrinter = it) } },