better padding buttons
This commit is contained in:
parent
59158e10c7
commit
8403bcf9c7
1 changed files with 6 additions and 4 deletions
|
|
@ -70,6 +70,7 @@ fun HomeScreen(paddingValues: PaddingValues) {
|
||||||
verticalArrangement = Arrangement.Center) {
|
verticalArrangement = Arrangement.Center) {
|
||||||
Greeting(serverURL, currentScreen);
|
Greeting(serverURL, currentScreen);
|
||||||
AnimatedContent(
|
AnimatedContent(
|
||||||
|
modifier = Modifier.padding(bottom = 24.dp),
|
||||||
targetState = currentScreen,
|
targetState = currentScreen,
|
||||||
transitionSpec = {
|
transitionSpec = {
|
||||||
fadeIn(
|
fadeIn(
|
||||||
|
|
@ -87,11 +88,13 @@ fun HomeScreen(paddingValues: PaddingValues) {
|
||||||
|
|
||||||
AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") {
|
AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") {
|
||||||
Row(
|
Row(
|
||||||
|
modifier = Modifier.padding(bottom = 12.dp)
|
||||||
|
.fillMaxWidth(),
|
||||||
horizontalArrangement = Arrangement.SpaceBetween
|
horizontalArrangement = Arrangement.SpaceBetween
|
||||||
) {
|
) {
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
onClick = { currentScreen = "serverDialog" },
|
onClick = { currentScreen = "serverDialog" },
|
||||||
modifier = Modifier.padding(top = 24.dp)
|
modifier = Modifier.weight(1f)
|
||||||
) {
|
) {
|
||||||
Row() {
|
Row() {
|
||||||
Text(text = "Change Server")
|
Text(text = "Change Server")
|
||||||
|
|
@ -99,6 +102,7 @@ fun HomeScreen(paddingValues: PaddingValues) {
|
||||||
}
|
}
|
||||||
Spacer(modifier = Modifier.width(12.dp))
|
Spacer(modifier = Modifier.width(12.dp))
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
onClick = {
|
onClick = {
|
||||||
when (currentScreen) {
|
when (currentScreen) {
|
||||||
"passwordDialog" -> {
|
"passwordDialog" -> {
|
||||||
|
|
@ -110,7 +114,6 @@ fun HomeScreen(paddingValues: PaddingValues) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
modifier = Modifier.padding(top = 24.dp)
|
|
||||||
) {
|
) {
|
||||||
Row() {
|
Row() {
|
||||||
when (currentScreen) {
|
when (currentScreen) {
|
||||||
|
|
@ -129,9 +132,8 @@ fun HomeScreen(paddingValues: PaddingValues) {
|
||||||
"loadingDialog" -> currentScreen = "loadingDialog"
|
"loadingDialog" -> currentScreen = "loadingDialog"
|
||||||
}},
|
}},
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(top = 24.dp)
|
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.height(128.dp),
|
.height(96.dp),
|
||||||
enabled = when(currentScreen) {
|
enabled = when(currentScreen) {
|
||||||
"serverDialog" -> isValidUrl(serverURL)
|
"serverDialog" -> isValidUrl(serverURL)
|
||||||
"passwordDialog" -> username.isNotEmpty() && password.isNotEmpty()
|
"passwordDialog" -> username.isNotEmpty() && password.isNotEmpty()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue