fix text
This commit is contained in:
		
							parent
							
								
									611a917c56
								
							
						
					
					
						commit
						32ae841387
					
				@ -40,6 +40,7 @@ import androidx.compose.ui.graphics.Color
 | 
				
			|||||||
import androidx.compose.ui.layout.ContentScale
 | 
					import androidx.compose.ui.layout.ContentScale
 | 
				
			||||||
import androidx.compose.ui.res.painterResource
 | 
					import androidx.compose.ui.res.painterResource
 | 
				
			||||||
import androidx.compose.ui.text.font.FontWeight
 | 
					import androidx.compose.ui.text.font.FontWeight
 | 
				
			||||||
 | 
					import androidx.compose.ui.text.style.TextAlign
 | 
				
			||||||
import androidx.compose.ui.tooling.preview.Preview
 | 
					import androidx.compose.ui.tooling.preview.Preview
 | 
				
			||||||
import androidx.compose.ui.unit.Dp
 | 
					import androidx.compose.ui.unit.Dp
 | 
				
			||||||
import androidx.compose.ui.unit.IntOffset
 | 
					import androidx.compose.ui.unit.IntOffset
 | 
				
			||||||
@ -66,19 +67,12 @@ fun LoginScreen() {
 | 
				
			|||||||
    val cor = rememberCoroutineScope()
 | 
					    val cor = rememberCoroutineScope()
 | 
				
			||||||
    Surface {
 | 
					    Surface {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Text(text = "mini", modifier = Modifier.padding(horizontal = 30.dp))
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Column(
 | 
					        Column(
 | 
				
			||||||
            modifier = Modifier.fillMaxSize(),
 | 
					            modifier = Modifier.fillMaxSize(),
 | 
				
			||||||
            verticalArrangement = Arrangement.Center,
 | 
					            verticalArrangement = Arrangement.Center,
 | 
				
			||||||
            horizontalAlignment = Alignment.CenterHorizontally,
 | 
					            horizontalAlignment = Alignment.CenterHorizontally,
 | 
				
			||||||
        ) {
 | 
					        ) {
 | 
				
			||||||
//                Text(
 | 
					 | 
				
			||||||
//                    text = "MiniPigs",
 | 
					 | 
				
			||||||
//                    style = MaterialTheme.typography.titleLarge,
 | 
					 | 
				
			||||||
//                    modifier = Modifier.padding(bottom = 36.dp)
 | 
					 | 
				
			||||||
//                )
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
            Row(
 | 
					            Row(
 | 
				
			||||||
                verticalAlignment = Alignment.CenterVertically,
 | 
					                verticalAlignment = Alignment.CenterVertically,
 | 
				
			||||||
@ -86,11 +80,12 @@ fun LoginScreen() {
 | 
				
			|||||||
                modifier = Modifier.fillMaxWidth()
 | 
					                modifier = Modifier.fillMaxWidth()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            ){
 | 
					            ){
 | 
				
			||||||
//                Text(text = "mini", modifier = Modifier.padding(horizontal = 30.dp))
 | 
					 | 
				
			||||||
                Image(
 | 
					                Image(
 | 
				
			||||||
                    painter = painterResource(id = R.drawable.heel),
 | 
					                    painter = painterResource(id = R.drawable.heel),
 | 
				
			||||||
                    contentDescription = "",
 | 
					                    contentDescription = "",
 | 
				
			||||||
                    modifier = Modifier.size(width = 145.dp, height = 100.dp).padding(bottom = 50.dp)
 | 
					                    modifier = Modifier
 | 
				
			||||||
 | 
					                        .size(width = 190.dp, height = 145.dp)
 | 
				
			||||||
 | 
					                        .padding(bottom = 90.dp)
 | 
				
			||||||
                )
 | 
					                )
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -123,7 +118,11 @@ fun LoginScreen() {
 | 
				
			|||||||
                    },
 | 
					                    },
 | 
				
			||||||
                    shape = RoundedCornerShape(12.dp)
 | 
					                    shape = RoundedCornerShape(12.dp)
 | 
				
			||||||
                ) {
 | 
					                ) {
 | 
				
			||||||
                    Text(text = "Sign In", style = MaterialTheme.typography.bodyLarge)
 | 
					                    Text(
 | 
				
			||||||
 | 
					                        text = "Sign In",
 | 
				
			||||||
 | 
					                        style = MaterialTheme.
 | 
				
			||||||
 | 
					                        typography.bodyLarge
 | 
				
			||||||
 | 
					                    )
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
@ -135,6 +134,33 @@ fun LoginScreen() {
 | 
				
			|||||||
            modifier = Modifier.fillMaxWidth()
 | 
					            modifier = Modifier.fillMaxWidth()
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Row(
 | 
				
			||||||
 | 
					            modifier = Modifier.fillMaxSize(),
 | 
				
			||||||
 | 
					//            verticalAlignment = Alignment.CenterVertically
 | 
				
			||||||
 | 
					        ) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Text(
 | 
				
			||||||
 | 
					                text = "pigs",
 | 
				
			||||||
 | 
					                fontSize = 25.sp,
 | 
				
			||||||
 | 
					                textAlign = TextAlign.End,
 | 
				
			||||||
 | 
					                modifier = Modifier.weight(1f).padding(vertical = 300.dp, horizontal = 100.dp)
 | 
				
			||||||
 | 
					            )
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Row(
 | 
				
			||||||
 | 
					            modifier = Modifier.fillMaxSize(),
 | 
				
			||||||
 | 
					//            verticalAlignment = Alignment.CenterVertically
 | 
				
			||||||
 | 
					        ) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Text(
 | 
				
			||||||
 | 
					                text = "mini",
 | 
				
			||||||
 | 
					                fontSize = 25.sp,
 | 
				
			||||||
 | 
					                textAlign = TextAlign.Start,
 | 
				
			||||||
 | 
					                modifier = Modifier.weight(1f).padding(vertical = 300.dp, horizontal = 100.dp)
 | 
				
			||||||
 | 
					            )
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Box(
 | 
					        Box(
 | 
				
			||||||
            modifier = Modifier.fillMaxSize()
 | 
					            modifier = Modifier.fillMaxSize()
 | 
				
			||||||
        ) {
 | 
					        ) {
 | 
				
			||||||
@ -145,18 +171,11 @@ fun LoginScreen() {
 | 
				
			|||||||
            )
 | 
					            )
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Column(
 | 
					
 | 
				
			||||||
            modifier = Modifier.fillMaxSize(),
 | 
					 | 
				
			||||||
            horizontalAlignment = Alignment.CenterHorizontally,
 | 
					 | 
				
			||||||
        ){
 | 
					 | 
				
			||||||
            Text(text = "mini", fontSize = 20.sp, modifier = Modifier.padding(top = 270.dp))
 | 
					 | 
				
			||||||
            Spacer(modifier = Modifier.width(65.dp))
 | 
					 | 
				
			||||||
            Text(text = "pigs", fontSize = 20.sp)
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@Composable
 | 
					@Composable
 | 
				
			||||||
@ -170,11 +189,20 @@ fun FindUser() {
 | 
				
			|||||||
        ) {
 | 
					        ) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Row(
 | 
				
			||||||
 | 
					                verticalAlignment = Alignment.CenterVertically,
 | 
				
			||||||
 | 
					                horizontalArrangement = Arrangement.Center,
 | 
				
			||||||
 | 
					                modifier = Modifier.fillMaxWidth()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            ){
 | 
				
			||||||
                Image(
 | 
					                Image(
 | 
				
			||||||
                    painter = painterResource(id = R.drawable.heel),
 | 
					                    painter = painterResource(id = R.drawable.heel),
 | 
				
			||||||
                    contentDescription = "",
 | 
					                    contentDescription = "",
 | 
				
			||||||
                modifier = Modifier.size(width = 145.dp, height = 100.dp).padding(bottom = 60.dp)
 | 
					                    modifier = Modifier
 | 
				
			||||||
 | 
					                        .size(width = 190.dp, height = 145.dp)
 | 
				
			||||||
 | 
					                        .padding(bottom = 90.dp)
 | 
				
			||||||
                )
 | 
					                )
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            var login by remember { mutableStateOf("") }
 | 
					            var login by remember { mutableStateOf("") }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -216,6 +244,32 @@ fun FindUser() {
 | 
				
			|||||||
                modifier = Modifier.align(Alignment.BottomCenter)
 | 
					                modifier = Modifier.align(Alignment.BottomCenter)
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Row(
 | 
				
			||||||
 | 
					            modifier = Modifier.fillMaxSize(),
 | 
				
			||||||
 | 
					//            verticalAlignment = Alignment.CenterVertically
 | 
				
			||||||
 | 
					        ) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Text(
 | 
				
			||||||
 | 
					                text = "pigs",
 | 
				
			||||||
 | 
					                fontSize = 25.sp,
 | 
				
			||||||
 | 
					                textAlign = TextAlign.End,
 | 
				
			||||||
 | 
					                modifier = Modifier.weight(1f).padding(vertical = 320.dp, horizontal = 100.dp)
 | 
				
			||||||
 | 
					            )
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Row(
 | 
				
			||||||
 | 
					            modifier = Modifier.fillMaxSize(),
 | 
				
			||||||
 | 
					//            verticalAlignment = Alignment.CenterVertically
 | 
				
			||||||
 | 
					        ) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Text(
 | 
				
			||||||
 | 
					                text = "mini",
 | 
				
			||||||
 | 
					                fontSize = 25.sp,
 | 
				
			||||||
 | 
					                textAlign = TextAlign.Start,
 | 
				
			||||||
 | 
					                modifier = Modifier.weight(1f).padding(vertical = 320.dp, horizontal = 100.dp)
 | 
				
			||||||
 | 
					            )
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -224,7 +278,9 @@ fun Done() {
 | 
				
			|||||||
    val cor = rememberCoroutineScope()
 | 
					    val cor = rememberCoroutineScope()
 | 
				
			||||||
    Surface {
 | 
					    Surface {
 | 
				
			||||||
        Column(
 | 
					        Column(
 | 
				
			||||||
            modifier = Modifier.fillMaxSize().background(Color.White),
 | 
					            modifier = Modifier
 | 
				
			||||||
 | 
					                .fillMaxSize()
 | 
				
			||||||
 | 
					                .background(Color.White),
 | 
				
			||||||
            horizontalAlignment = Alignment.CenterHorizontally,
 | 
					            horizontalAlignment = Alignment.CenterHorizontally,
 | 
				
			||||||
            verticalArrangement = Arrangement.Center
 | 
					            verticalArrangement = Arrangement.Center
 | 
				
			||||||
        ){
 | 
					        ){
 | 
				
			||||||
@ -245,7 +301,9 @@ fun Done() {
 | 
				
			|||||||
                painter = painterResource(id = R.drawable.happy_pig),
 | 
					                painter = painterResource(id = R.drawable.happy_pig),
 | 
				
			||||||
                contentDescription = "Happy pig",
 | 
					                contentDescription = "Happy pig",
 | 
				
			||||||
                contentScale = ContentScale.Fit,
 | 
					                contentScale = ContentScale.Fit,
 | 
				
			||||||
                modifier = Modifier.size(250.dp).padding(8.dp)
 | 
					                modifier = Modifier
 | 
				
			||||||
 | 
					                    .size(250.dp)
 | 
				
			||||||
 | 
					                    .padding(8.dp)
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -276,7 +334,9 @@ fun Error() {
 | 
				
			|||||||
    val cor = rememberCoroutineScope()
 | 
					    val cor = rememberCoroutineScope()
 | 
				
			||||||
    Surface {
 | 
					    Surface {
 | 
				
			||||||
        Column(
 | 
					        Column(
 | 
				
			||||||
            modifier = Modifier.fillMaxSize().background(Color.White),
 | 
					            modifier = Modifier
 | 
				
			||||||
 | 
					                .fillMaxSize()
 | 
				
			||||||
 | 
					                .background(Color.White),
 | 
				
			||||||
            horizontalAlignment = Alignment.CenterHorizontally,
 | 
					            horizontalAlignment = Alignment.CenterHorizontally,
 | 
				
			||||||
            verticalArrangement = Arrangement.Center
 | 
					            verticalArrangement = Arrangement.Center
 | 
				
			||||||
        ){
 | 
					        ){
 | 
				
			||||||
@ -297,7 +357,9 @@ fun Error() {
 | 
				
			|||||||
                painter = painterResource(id = R.drawable.scary_pig),
 | 
					                painter = painterResource(id = R.drawable.scary_pig),
 | 
				
			||||||
                contentDescription = "Scary pig",
 | 
					                contentDescription = "Scary pig",
 | 
				
			||||||
                contentScale = ContentScale.Fit,
 | 
					                contentScale = ContentScale.Fit,
 | 
				
			||||||
                modifier = Modifier.size(250.dp).padding(8.dp)
 | 
					                modifier = Modifier
 | 
				
			||||||
 | 
					                    .size(250.dp)
 | 
				
			||||||
 | 
					                    .padding(8.dp)
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user