💄 Fixes auth form alignment
This commit is contained in:
@@ -17,11 +17,16 @@ class API {
|
||||
json()
|
||||
}
|
||||
}
|
||||
val apiDataHolder = APIDataHolder.getInstance()
|
||||
val authDataHolder = AuthDataHolder.getInstance()
|
||||
|
||||
suspend fun doesServerRespond(): Boolean {
|
||||
// route '/' should return 'Hello world'
|
||||
val response = client.get(apiDataHolder.serverUrl)
|
||||
return response.status == HttpStatusCode.OK
|
||||
}
|
||||
|
||||
suspend fun loadAuths() {
|
||||
val apiDataHolder = APIDataHolder.getInstance()
|
||||
val authDataHolder = AuthDataHolder.getInstance()
|
||||
|
||||
val response = client.get("${apiDataHolder.serverUrl}/auth") {
|
||||
headers {
|
||||
append("Authorization", "Bearer ${apiDataHolder.token}")
|
||||
|
||||
@@ -9,12 +9,14 @@ import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.consumeWindowInsets
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.imePadding
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
|
||||
import androidx.compose.material.icons.filled.Visibility
|
||||
@@ -46,8 +48,6 @@ import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.core.content.edit
|
||||
import dev.svitan.antifed.ui.theme.AntiFedTheme
|
||||
import io.ktor.client.request.get
|
||||
import io.ktor.http.HttpStatusCode
|
||||
import kotlinx.coroutines.delay
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@@ -105,8 +105,7 @@ class AuthActivity : ComponentActivity() {
|
||||
checkingUrl = true
|
||||
|
||||
isServerUrlOk = try {
|
||||
val response = API.client.get(serverUrl)
|
||||
response.status == HttpStatusCode.OK
|
||||
API.doesServerRespond()
|
||||
} catch (_: Exception) {
|
||||
false
|
||||
}
|
||||
@@ -205,10 +204,10 @@ class AuthActivity : ComponentActivity() {
|
||||
}) { padding ->
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.padding(padding)
|
||||
.padding(bottom = 64.dp)
|
||||
.fillMaxSize()
|
||||
.consumeWindowInsets(padding)
|
||||
.imePadding()
|
||||
.fillMaxSize(),
|
||||
.verticalScroll(rememberScrollState()),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.Center
|
||||
) {
|
||||
|
||||
Reference in New Issue
Block a user