🔧 Adds and upgrades dependencies (ktor client)

2025-05-16 17:01:08 +02:00
parent de41e4a64e
commit e4a2fdfd59
6 changed files with 107 additions and 23 deletions
--- a/frontend/app/build.gradle.kts
+++ b/frontend/app/build.gradle.kts
@@ -40,7 +40,6 @@ android {
 }

 dependencies {
-
    implementation(libs.androidx.core.ktx)
    implementation(libs.androidx.lifecycle.runtime.ktx)
    implementation(libs.androidx.activity.compose)
@@ -52,6 +51,8 @@ dependencies {
    implementation(libs.androidx.appcompat)
    implementation(libs.material)
    implementation(libs.androidx.activity)
+    implementation(libs.ktor.client.core)
+    implementation(libs.ktor.client.cio)
    testImplementation(libs.junit)
    androidTestImplementation(libs.androidx.junit)
    androidTestImplementation(libs.androidx.espresso.core)
--- a/frontend/app/src/main/java/dev/svitan/antifed/AuthActivity.kt
+++ b/frontend/app/src/main/java/dev/svitan/antifed/AuthActivity.kt
@@ -4,17 +4,37 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+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.material.icons.Icons
-import androidx.compose.material.icons.filled.Refresh
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import dev.svitan.antifed.ui.theme.AntiFedTheme
+import kotlinx.coroutines.delay

@OptIn(ExperimentalMaterial3Api::class)
 class AuthActivity : ComponentActivity() {
@@ -24,6 +44,8 @@ class AuthActivity : ComponentActivity() {
        setContent {
            AntiFedTheme {
                var serverUrl by remember { mutableStateOf("") }
+                var checkingUrl by remember { mutableStateOf(false) }
+
                fun isServerUrlOkay(): Boolean {
                    var re = Regex(
                        "(?:http[s]?:\\/\\/.)?(?:www\\.)?[-a-zA-Z0-9@%._\\+~#=]{2,256}\\.[a-z]{2,6}\\b(?:[-a-zA-Z0-9@:%_\\+.~#?&\\/\\/=]*)",
@@ -32,7 +54,38 @@ class AuthActivity : ComponentActivity() {
                    return re.containsMatchIn(serverUrl)
                }

+                LaunchedEffect(serverUrl) {
+                    if (serverUrl.isBlank()) return@LaunchedEffect
+                    if (!isServerUrlOkay()) return@LaunchedEffect
+
+                    checkingUrl = true
+                    delay(1000)
+//                    val client = HttpClient(CIO)
+//                    val response = client.get(serverUrl)
+//                    println(response.status)
+                    checkingUrl = false
+                }
+
                Scaffold(
+                    topBar = {
+                        TopAppBar(
+                            colors = TopAppBarDefaults.topAppBarColors(
+                                containerColor = MaterialTheme.colorScheme.primaryContainer,
+                                titleContentColor = MaterialTheme.colorScheme.primary
+                            ),
+                            title = {
+                                Text(stringResource(R.string.auth))
+                            },
+                            navigationIcon = {
+                                IconButton(onClick = { finish() }) {
+                                    Icon(
+                                        imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
+                                        contentDescription = stringResource(R.string.go_back)
+                                    )
+                                }
+                            }
+                        )
+                    },
                    modifier = Modifier.fillMaxSize()
                ) { innerPadding ->
                    Column(
@@ -51,6 +104,14 @@ class AuthActivity : ComponentActivity() {
                            label = { Text(stringResource(R.string.server_url)) },
                            singleLine = true,
                            isError = !isServerUrlOkay(),
+                            trailingIcon = {
+                                if (checkingUrl)
+                                    CircularProgressIndicator(
+                                        modifier = Modifier.width(36.dp),
+                                        color = MaterialTheme.colorScheme.secondary,
+                                        trackColor = MaterialTheme.colorScheme.surfaceVariant
+                                    )
+                            }
                        )
                    }
                }
--- a/frontend/app/src/main/java/dev/svitan/antifed/MainActivity.kt
+++ b/frontend/app/src/main/java/dev/svitan/antifed/MainActivity.kt
@@ -5,18 +5,34 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AccountCircle
-import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material.icons.outlined.AccountCircle
 import androidx.compose.material.icons.outlined.Menu
-import androidx.compose.material.icons.sharp.AccountCircle
-import androidx.compose.material.icons.twotone.AccountCircle
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.*
+import androidx.compose.material3.DrawerValue
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalDrawerSheet
+import androidx.compose.material3.ModalNavigationDrawer
+import androidx.compose.material3.NavigationDrawerItem
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.rememberDrawerState
+import androidx.compose.runtime.rememberCoroutineScope
+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.unit.dp
@@ -78,7 +94,7 @@ class MainActivity : ComponentActivity() {
                                    titleContentColor = MaterialTheme.colorScheme.primary
                                ),
                                title = {
-                                    Text("AntiFed")
+                                    Text(stringResource(R.string.app_name))
                                },
                                navigationIcon = {
                                    IconButton(onClick = {
--- a/frontend/app/src/main/res/values-sk/strings.xml
+++ b/frontend/app/src/main/res/values-sk/strings.xml
@@ -4,4 +4,5 @@
    <string name="auth">AntiFed autentikácia</string>
    <string name="show_menu">Ukázať menu</string>
    <string name="auth_icon_desc">Ísť do nastavení autentikácie</string>
+    <string name="go_back">Ísť späť</string>
 </resources>
--- a/frontend/app/src/main/res/values/strings.xml
+++ b/frontend/app/src/main/res/values/strings.xml
@@ -4,6 +4,7 @@
    <string name="auth">AntiFed auth</string>
    <string name="show_menu">Show menu</string>
    <string name="auth_icon_desc">Go to auth settings</string>
+    <string name="go_back">Go back</string>
    <!-- Strings used for fragments for navigation -->

 </resources>