diff --git a/backend/src/main/kotlin/services/Action.kt b/backend/src/main/kotlin/services/Action.kt
index 07b2a83..f1eb835 100644
--- a/backend/src/main/kotlin/services/Action.kt
+++ b/backend/src/main/kotlin/services/Action.kt
@@ -28,7 +28,7 @@ enum class ActionKind {
}
@Serializable
-class ActionDTO(
+data class ActionDTO(
val id: String,
val name: String,
val kind: ActionKind,
@@ -39,7 +39,7 @@ class ActionDTO(
)
@Serializable
-class NewActionDTO(
+data class NewActionDTO(
val name: String,
val kind: String,
val source: String,
@@ -47,14 +47,14 @@ class NewActionDTO(
)
@Serializable
-class UpdateActionDTO(
+data class UpdateActionDTO(
val name: String?,
val kind: String?,
val source: String?
)
@Serializable
-class RunActionDTO(
+data class RunActionDTO(
val pin: String,
val key: String
)
diff --git a/backend/src/main/kotlin/services/Auth.kt b/backend/src/main/kotlin/services/Auth.kt
index 3d587ac..793a31d 100644
--- a/backend/src/main/kotlin/services/Auth.kt
+++ b/backend/src/main/kotlin/services/Auth.kt
@@ -10,14 +10,14 @@ import java.time.format.DateTimeFormatter
import java.util.UUID
@Serializable
-class AuthDTO(
+data class AuthDTO(
val id: String,
val name: String,
val createdAt: String
)
@Serializable
-class NewAuthDTO(
+data class NewAuthDTO(
val name: String,
val pin: String,
val key: String
diff --git a/frontend/app/src/main/java/dev/svitan/antifed/API.kt b/frontend/app/src/main/java/dev/svitan/antifed/API.kt
new file mode 100644
index 0000000..d939321
--- /dev/null
+++ b/frontend/app/src/main/java/dev/svitan/antifed/API.kt
@@ -0,0 +1,20 @@
+package dev.svitan.antifed
+
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.android.Android
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.serialization.kotlinx.json.json
+import kotlinx.serialization.Serializable
+
+val client = HttpClient(Android) {
+ install(ContentNegotiation) {
+ json()
+ }
+}
+
+@Serializable
+data class AuthDTO(
+ val id: String,
+ val name: String,
+ val createdAt: String
+)
diff --git a/frontend/app/src/main/java/dev/svitan/antifed/AuthActivity.kt b/frontend/app/src/main/java/dev/svitan/antifed/AuthActivity.kt
index 2f67b49..e4ad573 100644
--- a/frontend/app/src/main/java/dev/svitan/antifed/AuthActivity.kt
+++ b/frontend/app/src/main/java/dev/svitan/antifed/AuthActivity.kt
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
import androidx.compose.material3.CircularProgressIndicator
@@ -32,11 +33,11 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import dev.svitan.antifed.ui.theme.AntiFedTheme
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.android.Android
import io.ktor.client.request.get
import io.ktor.http.HttpStatusCode
import kotlinx.coroutines.delay
@@ -89,7 +90,6 @@ class AuthActivity : ComponentActivity() {
delay(1000)
checkingUrl = true
- val client = HttpClient(Android)
val response = client.get(serverUrl)
checkingUrl = false
@@ -162,7 +162,9 @@ class AuthActivity : ComponentActivity() {
onValueChange = { token = it },
label = { Text(stringResource(R.string.token)) },
singleLine = true,
- isError = token.isBlank()
+ isError = token.isBlank(),
+ visualTransformation = PasswordVisualTransformation(),
+ keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password)
)
}
}
diff --git a/frontend/app/src/main/res/drawable/ic_launcher_background.xml b/frontend/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/frontend/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/app/src/main/res/drawable/ic_launcher_foreground.xml b/frontend/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/frontend/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-