remove login padding top/bottom
This commit is contained in:
parent
df40aa8455
commit
59158e10c7
1 changed files with 22 additions and 17 deletions
|
|
@ -11,6 +11,7 @@ import androidx.compose.animation.fadeIn
|
||||||
import androidx.compose.animation.fadeOut
|
import androidx.compose.animation.fadeOut
|
||||||
import androidx.compose.animation.togetherWith
|
import androidx.compose.animation.togetherWith
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.PaddingValues
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
|
|
@ -64,7 +65,7 @@ fun HomeScreen(paddingValues: PaddingValues) {
|
||||||
.padding(paddingValues)
|
.padding(paddingValues)
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.imePadding()
|
.imePadding()
|
||||||
.padding(all = 56.dp),
|
.padding(start = 56.dp, end = 56.dp),
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
verticalArrangement = Arrangement.Center) {
|
verticalArrangement = Arrangement.Center) {
|
||||||
Greeting(serverURL, currentScreen);
|
Greeting(serverURL, currentScreen);
|
||||||
|
|
@ -84,39 +85,42 @@ fun HomeScreen(paddingValues: PaddingValues) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Row (
|
AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") {
|
||||||
horizontalArrangement = Arrangement.SpaceBetween
|
Row(
|
||||||
) {
|
horizontalArrangement = Arrangement.SpaceBetween
|
||||||
AnimatedVisibility(currentScreen == "passwordDialog") {
|
) {
|
||||||
OutlinedButton (
|
OutlinedButton(
|
||||||
onClick = {currentScreen = "serverDialog"},
|
onClick = { currentScreen = "serverDialog" },
|
||||||
modifier = Modifier.padding(top = 24.dp)
|
modifier = Modifier.padding(top = 24.dp)
|
||||||
) {
|
) {
|
||||||
Row() {
|
Row() {
|
||||||
Text(text = "Change Server")
|
Text(text = "Change Server")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
Spacer(modifier = Modifier.width(12.dp))
|
||||||
Spacer(modifier = Modifier.width(12.dp))
|
OutlinedButton(
|
||||||
AnimatedVisibility(currentScreen == "passwordDialog") {
|
|
||||||
OutlinedButton (
|
|
||||||
onClick = {
|
onClick = {
|
||||||
when(currentScreen) {
|
when (currentScreen) {
|
||||||
"passwordDialog" -> {currentScreen = "apiDialog"}
|
"passwordDialog" -> {
|
||||||
"apidialog" -> {currentScreen = "passwordDialog"}
|
currentScreen = "apiDialog"
|
||||||
|
}
|
||||||
|
|
||||||
|
"apidialog" -> {
|
||||||
|
currentScreen = "passwordDialog"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
modifier = Modifier.padding(top = 24.dp)
|
modifier = Modifier.padding(top = 24.dp)
|
||||||
) {
|
) {
|
||||||
Row() {
|
Row() {
|
||||||
when(currentScreen) {
|
when (currentScreen) {
|
||||||
"passwordDialog" -> Text(text = "Use API Key")
|
"passwordDialog" -> Text(text = "Use API Key")
|
||||||
"apiDialog" -> Text(text = "Use Password")
|
"apiDialog" -> Text(text = "Use Password")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Button(
|
Button(
|
||||||
onClick = {when(currentScreen) {
|
onClick = {when(currentScreen) {
|
||||||
"serverDialog" -> currentScreen = "passwordDialog"
|
"serverDialog" -> currentScreen = "passwordDialog"
|
||||||
|
|
@ -124,7 +128,8 @@ fun HomeScreen(paddingValues: PaddingValues) {
|
||||||
"apiDialog" -> currentScreen = "loadingDialog"
|
"apiDialog" -> currentScreen = "loadingDialog"
|
||||||
"loadingDialog" -> currentScreen = "loadingDialog"
|
"loadingDialog" -> currentScreen = "loadingDialog"
|
||||||
}},
|
}},
|
||||||
modifier = Modifier.padding(top = 24.dp)
|
modifier = Modifier
|
||||||
|
.padding(top = 24.dp)
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.height(128.dp),
|
.height(128.dp),
|
||||||
enabled = when(currentScreen) {
|
enabled = when(currentScreen) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue