yilsem/aiturk-mobil
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

fixes

Browse Source
This commit is contained in:
Hy4ri committed 2026-06-16 00:52:36 +03:00
1 parent 0562906634
commit 8ca4599c6a
14 files changed
+362 -166
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/m57/hermescontrol/ui/channels/ChannelsScreen.kt
+42 -20
View File
@@ -26,6 +26,7 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
@@ -41,6 +42,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewmodel.compose.viewModel
import com.m57.hermescontrol.data.model.MessagingPlatformUpdate
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -135,8 +137,20 @@ fun ChannelsScreen(
style = MaterialTheme.typography.bodyMedium,
)
}
Button(onClick = { showConfigureForm = !showConfigureForm }) {
Text(if (showConfigureForm) "Cancel" else "Configure")
Row(verticalAlignment = Alignment.CenterVertically) {
Switch(
checked = platform.enabled,
onCheckedChange = { isChecked ->
viewModel.configurePlatform(
platform.id,
MessagingPlatformUpdate(enabled = isChecked),
)
},
)
Spacer(modifier = Modifier.width(8.dp))
Button(onClick = { showConfigureForm = !showConfigureForm }) {
Text(if (showConfigureForm) "Cancel" else "Configure")
}
}
}
@@ -147,20 +161,19 @@ fun ChannelsScreen(
style = MaterialTheme.typography.titleMedium,
)
val fields =
if (platform.name.lowercase() == "telegram") {
listOf("bot_token", "chat_id")
} else {
listOf("webhook_url", "channel")
}
val envFields = platform.envVars.orEmpty()
val inputValues = remember { mutableStateMapOf<String, String>() }
fields.forEach { field ->
envFields.forEach { field ->
OutlinedTextField(
value = inputValues[field].orEmpty(),
onValueChange = { inputValues[field] = it },
label = { Text(field.replace("_", " ").uppercase()) },
value = inputValues[field.key].orEmpty(),
onValueChange = { inputValues[field.key] = it },
label = { Text(field.prompt ?: field.key) },
placeholder = {
if (field.isSet) {
Text("******** (Already Configured)")
}
},
modifier = Modifier.fillMaxWidth(),
)
Spacer(modifier = Modifier.height(8.dp))
@@ -168,7 +181,7 @@ fun ChannelsScreen(
Button(
onClick = {
viewModel.configurePlatform(platform.name, inputValues.toMap())
viewModel.configurePlatform(platform.id, inputValues.toMap())
showConfigureForm = false
},
modifier = Modifier.align(Alignment.End),
@@ -176,16 +189,25 @@ fun ChannelsScreen(
Text("Save Settings")
}
} else {
platform.details?.let { details ->
if (details.isNotEmpty()) {
Spacer(modifier = Modifier.height(8.dp))
Text(text = "Details:", style = MaterialTheme.typography.titleSmall)
details.forEach { (key, value) ->
val envFields = platform.envVars.orEmpty()
if (envFields.isNotEmpty()) {
Spacer(modifier = Modifier.height(8.dp))
Text(text = "Configured Keys:", style = MaterialTheme.typography.titleSmall)
envFields.forEach { field ->
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
) {
Text(
text = "$key: $value",
text = field.key,
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
Text(
text = if (field.isSet) "Configured" else "Not set",
style = MaterialTheme.typography.bodyMedium,
color = if (field.isSet) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
)
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/channels/ChannelsViewModel.kt
+14 -6
View File
@@ -3,6 +3,7 @@ package com.m57.hermescontrol.ui.channels
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.m57.hermescontrol.data.model.MessagingPlatform
import com.m57.hermescontrol.data.model.MessagingPlatformUpdate
import com.m57.hermescontrol.data.remote.ApiClient
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
@@ -48,27 +49,34 @@ class ChannelsViewModel : ViewModel() {
}
fun configurePlatform(
name: String,
config: Map<String, String>,
platformId: String,
update: MessagingPlatformUpdate,
) {
viewModelScope.launch {
try {
val response =
withContext(Dispatchers.IO) {
ApiClient.hermesApi.configurePlatform(name, config)
ApiClient.hermesApi.configurePlatform(platformId, update)
}
if (response.isSuccessful) {
_uiState.update { it.copy(toastMessage = "$name configured successfully") }
_uiState.update { it.copy(toastMessage = "$platformId configured successfully") }
loadPlatforms()
} else {
_uiState.update { it.copy(toastMessage = "Failed to configure $name: HTTP ${response.code()}") }
_uiState.update { it.copy(toastMessage = "Failed to configure platform: HTTP ${response.code()}") }
}
} catch (e: Exception) {
_uiState.update { it.copy(toastMessage = "Failed to configure $name: ${e.message}") }
_uiState.update { it.copy(toastMessage = "Failed to configure platform: ${e.message}") }
}
}
}
fun configurePlatform(
platformId: String,
config: Map<String, String>,
) {
configurePlatform(platformId, MessagingPlatformUpdate(env = config))
}
fun clearToast() {
_uiState.update { it.copy(toastMessage = null) }
}